updated TODO
added Address object