Interim commit: working on NATT and automatic address stuff