Refactor Moneylender
Implement Treasure Map