New Data structure, other UI Changes