moved vehicle methods to vehicle