Work on user editing