Implement some of the previously undefined functions