continued working on a stone implementation
ugly codebase, but first visible results