Currency refactor + rich comparison methods