Routes getting too complicated. Starting over