- Merged Santarii's code
- Update to mapping system