Started work on groups, fixed trading