Grid edits, add setLocation and swapLocation

added more changes to the Grid class to make it more robust, including
setLocation and swapLocation. Removed addObject (in favor of
setLocation) and changed grid code to use class functions.