Fancy edit now has errors - needs to be tested
Tested errors, works fine. Ready for merge