Did lots of work to get the add builder working