Merged Tyler's branch in, added cogs and fence to room2