Add rename functionality, still a bit rough