Add fungible and do some clean up