Almost done with proper schema and updates