Correct if then logic
Add touch recognition