update todo and play around with controller functions