Full build system seems to be working now