Nearly done on first draft of views