I am doing something like this on the new branch I'm working on, so for now let's stick with this.