Added some performance tests,
Rearranged entity so that its no longer
more changes to come