Initial commit of expanded functions (as opposed to stubs)