partial rewrite of e020 (no-working, yet)