fix
inserted average and improved DRY
fix
fix
fix
fix
working on measures
adding measures files
model
fix