Partial Merge with AddTask
Merge branch 'splashtomain' of https://github.com/TomK86/PreCrastination into splashtomain
AddTask merged