touch up some stuff
add visible packet
start making everything move around the ship
solve merge