Examples working we need to refactor