First pass for Rothfus #24