Better support for the incoming UI, custom placemarker, tons of reorganization.