renumber
remove viewType
add stuff that i ha d moved