I'm gonna be honest, I barely remember working on this.
I just found it back with changed files. I'm committing so we can see what happens.