Further work.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>