changed primary key on table and wrote a function to determine count
added notes
merges with branch head