Lots of work done on ui and measurement class