More work on finance module.