Change Todos to be based on custom Collection class