Add measurement cycle control (unfinished)