More scaffold tweaking, close to being able to start testing.