66553290 funding round rework

@hkal 

https://www.pivotaltracker.com/story/show/66168010
https://www.pivotaltracker.com/story/show/66553290

Please run this for staging data and take a look at the output before approving the merge.