Object functionality and a lot of cleanup
Updated load test