Integration capybara

from Eric, no apparent conflicts