workin wersion of maps - using mocks