V3

Only minor things left (as of 7 may), delete+mail+UI