Add some rudimentary baby support