Refactors. Adds rickshaw