more functionality added, proper moves, TODO: non-random maps, storage