All working except edit, will revise