Updated several more sections of the planning doc and moved user stories to the correct place.
Fixed merge conflicts