Made some progress on new views