Changed finances to be more cohesive
Fixed merge