Financial

Refactored financial class.