Completed

Filled out functions and added comments