Reviewed by Steve

Great stuff!!!

A few thoughts / suggestions within :grinning: