Added more direct packet handling, making the actual handler next.