settings work
Merge remote-tracking branch 'origin/Matt'sBranch3' into Matt'sBranch32
settings view implemented, stats updating most time taken each time.