Adding some flowfunction stuff to test...prepare for breakage