Make setup more generic?