Resolve conflict
Add the dependent files from before.
Tabs being saved (rudimentary, but functional)