Sort:  

Done now... https://github.com/Hive-Pizza-Team/HiveNova/pull/85 (Maybe you might want to create a separate branch for this).

Trying to see how to apply the Agent code... take this with a little big grain of salt... as its an agent...

But if you are testing on somewhere separate server, let me know and I can give it a go for too.