Refactored setup, added map