More plaid progress ... and Water....