Filled out some stubs, added report generator