Draft version
Added new stubs.