Version2

Making branch for version 2 without flowmeters