Updated GoTo task class - still needs review