Tons of changes to get this closer to being buildable from this directory;