Did a little heap stuff. Testing to follow.