Moving stuff around, adding safari.