examples now working completely after refactor .. oops