added sort by grape / major refactor