Pre-branch commit
Did reset schema, also now in 3NF