Lots of hexbox overhaul