Started adding proper edit mode