Add initial vlan support. Needs cleaning up.