made modules from tasks and removed some features, broken ATM