Massive changes to a new structure and views