Engine Build/Clean Up - Jan 9th 2019