Added some views. Added TODO.