View2: removed TODO
Model: added TODO