Implemented edit mode; Tests oddly failing