Work in progress on addSetData, addressing #8 and #9.