Looks good at first glance! I'll give it a test drive today. Are you currently working on DHCP integration for other zones? Coincidentally, I started working on VLAN/QinQ on friday. Just so we don't do duplicate work.