[CS] Laying some groundwork