Tweaked tasks
More small tweaks
Implementation - datatypes