Incomplete attempt at #88