changed some stuff around in routes to use match instead of get
rspecs for scenario 2 mostly working