Some stuff

Split the retrieve route up