This is a temporary commit to demonstrate as close as we can get to Wu's assumptions. Next commit will reverse everything.