Dataediting

I might keep adding edits throughout the day, so hold off on merging