more clean up
finished cleaning up builder so that required properties have their own builders
also organized the members