E2 done, needs testing