Originally this was just a request from another board but I've gone further