Fixup of the initial source commit. Task0 and Task2 is now working.