Editplot

Pull request for code review...ready to merge into master