Finish units classes, have to documente this