another giant commit with working routes