Attempting to clean up and finish the implementation