working on updateing to the new unit structure