Added NoteViewController, Enums, etc