Refactoring code to mesh with the map class, making all units extend a Units interface