first commit point, still needs firewall and databag