Rewrite of funnel, again
Updated setup.py