After Monday subgroup meeting 10-26-2014 Add some TODO Lists and remove unimportant functions