Refactor units

Refactore to remove the need to store a unit ID. Store a unit's slot
reference within the unit object