Move more code to new currency classes