Added units, initial engineering calcs