add everything, still need to figure out where to hook in game-loop