Work in progress - updated API skeleton.