need to add the functions that are commented out