Pass around env, closes #14. Also drop subject in favor of object