WIP on finantial, almost done