big commit, handcuff overhaul