Feature/one instance per value

Concept works, develop ready for changes