Re-works the example again. Onto something big here.