Bug Fix - Fix the unit manager, set pattern for unit functionality to refactor into - Trello 184