Update 7

Almost complete. First 2 views done. 3rd has to be worked on. 4th is
still incomplete.