overhauled units and stats system
merge