More work, API listener is done, just access control left