Lone Element Refactor

Completed refactoring of lone element, with generated tests.