#396 did a great job of getting things started, however we should expand on this and add more test coverage