worked on having editable titles, but didn't finish
Merge remote-tracking branch 'origin/working'