Additional functions completed, yet to be debugged