Add an expectation for currency support
Add some more TODO items