further progress in refactoring.  something wrong with how dates and/or annotations are being passed to graph library