Continuing to add overloads and comment