Refactoring
Another big refactor
Updates
Added examples