Add rm, more or less done