All done except units and conditions
Schema complete with some minor fixes outstanding