cleaned up some class names and started the mock report