more logging
more logging
turn on trace
update api to handle new keys, update tests