Merge pull request #17 from mbiokyle29/new_house

New house
Merge pull request #18 from mbiokyle29/ui

Pulled.