Finished Stone implementation and javadocs