New approach for enqueuing tasks... (possible v1.2)
Make tests tougher...