finally tracked down data store bug
Update TODO