BROKEN: Work in progress

This commit will not compile. Working on separating renaming logic from
UI.