Added some packet based stuff

Forgot track of time and did not commit in time