Added basic logic to punches