moved my changes for financial and metric over to develop branch

It's a bit messy in there, sorry -- goofed up a cherry pick merge. All tests passing.