Started to add editing features