Back up to feature parity, though God, my code is a mess.