Continue refactor, build out examples, methods, redirects