initial pass at #21