about to start testin after intense weekend code upgrades