Minor prep work and notes