added stubs for some methods, more tests passing