Financial systems

merging in to master to contune testing via blocks