Started adding Performance helpers. Refactor/tidy up of other classes
Added performance tests
Update to Performance tests