Edit reimplemented

Need to debug model; garbage added to root