Weekend work

Work done over the weekend.