WIP
Rewrite of financial table complete