Actually need to remove the reference to time functions
Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework