Add concept of editing state
Use enum for editing state