1001 change putting it all together

From Scott Storla