Loads of work on modularization, BROKEN BUILD