added currency and refactored money