added todos!