Start of packet stuff and a little formatting

Probably wrong, but it's a start