Adapters and nms needs updating still, alongside some other fixes and changes, but I'm too tired for that now