Commiting some changes to flowmeter, but it's not done yet