Totally, I've moved it into it's own file.