More refactoring of stone

I think this about finishes up the stone refactoring for now