WIP: missing function headers