Updated xml, db, tasks to account for grade weight