Closes GH-288
This will be used by my next commit. But trying to get the build going since CI blew up