First commit with online measurements. TODO: check if this works