Made more edits to the request factory to accommodate for multiple optional way-points. needs to be finished.