Refactored Map into new object
Added wifiscanner implementation