Add all the progress so far, can do arg and (some) type coverage