Financial update: issue 60, 78, 79
Merge branch 'financial' into production