All comments added, still stubs
Had forgotten to add tests, switched back to stubs and added tests, fails all