Added build preparer, READY FOR SIMPLIFY