Do you mind splitting this off to a separate file?