Feature flow monitor

Final pull for Version 2