Add all functions per #1