Namespaced the functions, as I forgot.