Some more startup work