moved some stuff, started integrating packet work