Got this to work (now just to get the tests happy :)