Added Rickshaw for rockin' maps
Cleanup.