Implemented Phillip's map work