add todos
finish merging with master