Reorganized to allow for new views