If we're going to merge let's create an issue for @ascott1 to look into.