Some work over the weekend, per feedback