refactored incoming_controller.rb and routes