New version WIP; added stubs for integration