working on maps implementation