Huge cleanup and real data being loaded and edited