final weekend commit

finished user editing