Initial pass at #32 optional return