Feature/get basic trips functionality working