Major overhauls to the content provider and general structures within the app