Merge + closer to saving edits in list view

- Methods filled out
- proper encapsulations
- resolve merge
- poop