Finished 22 and 23; added comments