Finalised initial delay code, VLANs are working, little tidy up