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