refactored to env, poly, and fx
switched dep to annie