- Added support for Remision
- Not happy about the implementation, would like to clean up later.