version0.2

Clean up existing code to make way for groups.