Still more work on them

Waterpicker <Waterpicker@rocketmail.com>