More refactoring.
Adding example file.