Merged code

Merged Dennis' new code
can walk out of the house