Finished the function calls, this is now fully supported