Update to Infrastructure, help catch problems before beta