Model stuff, keeping up with drake branch changes.