OK, this one is functional. Added a missing function.