More content
Clean up TODOs, add views diagram