New Class:fn call system
Some improvements in currency handling