Group feature - Mass code cleanup and refactor. UX has to be improved, still