Filled in functions and comments