Building infrastructure update. Testing follows.