Stuff from michael's repo that are new
Just a couple of files that I forgot