Start work on STM version