Completed Functions

With comments updated