Fixes #141 Fixes #143. Removed changes introduced for grouping to underlying Task class, which broke a lot of stuff