Tidied up bits and pieces and started developing Evaluation class.