Bot2 Moves Implemented

Also tweaked importer code