Added some logic for responding

oh god tabs