Finished basically everything
Merge branch 'master' of https://github.com/hgrimberg01/quash