Finish up & close #21