Add Goombas, organize stuff