Added more routes; Started to break up functions