Hacked on views a bit