added rest of Map application