Commit to Sync with Latest Tasks code

some basic re-factoring, changed from a Dictionary collection to
SortedDictionary