Added most of the format variables. Needs conversions to different temp units