merge
add vehicle data access
add date parsing