Add doors
A bit of refactoring
Add door highlighting.