Lots of work on the firewall section