Added additional annotation dialogs and created test file.  It's versioned because, you know, what the hey.