Moved around stuff. Added report