added two variables to exchange, updated conversion function

Has a bug returning null when you press back, but the rest functions works