committing all the junk we've done so far today