Inching forward

Doesn't compile but stubs for a few functions in place