Now organizing by viewType