add logic to only intercept at certain times
fix checkbox
add stuff
merge