updated thread, removed todo
removed todo since setters won't be part of the interface