Moved all motion checking into Map class