The Pull Request Michael Should Have Made

#285 #284 #283 #282 #281 #279 #278 #276 #273 #268 #267 #265 #263 #261