added additional todos to make the application more flexible