about to get rid of builder
Fair bit of cleanup