WIP Track intermediate scores in the database

Better validation