WIP - initial service hooks