Rearranged some things, working on Mouse Hole