New work in progress, if anyone wants to leave suggestions...