Major refactor - now using react-router + dispatchr