Initial commit for database redesign