More work on NoteContainer