Normalize data
create templates for data
Clean up part of data support transition
normalize data
consistent nav
clean up