Bascially what I want here is a ~10 to 15 line pull request we can verify and merge in quickly.