Development on unit class