Began implementation of separate edit and study modes.