add todos for further things