Continue working on stub.
Fix conflicts.