added mapping functionality & refactored some of the API calling & parsing