Jangling keys

A few more edits. This one might work?