Cleaned up a bit. Added a TaskFactory for adding to List.