Yup, I'll move it to a separate file. It' really just clutters up things here.