Getting back up and running
Updates to build system; everything works now