added a bunch of todo stubs