Added some stuff for the Views, but none of it is set in stone, and it currently will not even compile.