Manual Tasks Refactor

Slight refactor of coen-hyde's manual-tasks functionality, so that it does not break the existing client.