Update to include all possible functions right now