Version 2

Tasks are done, except for exceptions