Tested guest behavior. Cleaned up controllers