Basic public API sort of working