More Code I Should've Committed Earlier