added todo
added test file stubs