More work on basic sprinter infrastructure