Finishing up to #69