clean house
Beginning rewrite