added todos for further planning