WIP: Added basic task classes