Got more done on the project, not quite there yet though! #mjfam comment it :)