Some umm, more work on 1.7! Fun times, more packety based stuffs...