Added TODOs to approach the MVC pattern.