Refactor stones to use points