Some work-in-progress code I never pushed