Added Stash support

Also removed unused stuff at the moment