added todos, removed old shit