New build system (not working yet)