Major rework

should work in MP now
@todo -> reset original unit owner