Refactor. Add simple collection. Start new version