(Issue 655-2) sqash me: Feature complete, working tests. Needs coverage analysis and self-review