More plan things

Incomplete.