A first basic pass at #441