Add comments, avoid needlessly recreating "s"
Stub STM-UY implementation with test