Major fix: reimplement activity environment