Some work done on the economy stuff