redesign part 1
out with the old
Merge pull request #6 from pathouse/redesign

House cleaning