Almost finished (until David checks) e3.