Grouping

Add more formatting options. Closes #3