Major refactoring
Added cactus and lilypads