Nov12

Creating pull request for code review. See comments in diff.
What are you doing? In the CM, we hard-coded the entrances/exit points. Again, always refer to the CM.