More progress done on the main build process