Ditto on moving this to a separate file