More rickshaw progress (#18)