Added dependencies and more TODO items