Hacked on views a bit

I didn't run tests, so I might have broken something. I also might have gotten to clever in some bits. Let me know.