UPDATE: First basic implementation and tests