WIP - Added new files to build and fixed some compile errors