Initial hooks and tests, still a lot to do :-)