Updated TODO
Extracted task class to a separate file