More Debounce Stuff

Forgot to fix/uncomment from testing