builder model stuff

Maybe take a look at this... it needs some cleaning up.