lots of stuff is working now, third packet being sent
fixed for the merge