Add new fields and calculate result and status from data instead of hardcoding it
Add new fields to model, adjust some ui strings