diff --git a/pixiecore/bootgraph.dot b/pixiecore/bootgraph.dot
index be50af9..136bb90 100644
--- a/pixiecore/bootgraph.dot
+++ b/pixiecore/bootgraph.dot
@@ -1,10 +1,21 @@
 digraph G {
-    ProxyDHCP1 [label="ProxyDHCP"];
-    ProxyDHCP2 [label="ProxyDHCP (iPXE)"];
-    
-    ProxyDHCP1 -> PXE [label=< <i>UEFI</i> >, fontsize=11];
-    ProxyDHCP1 -> TFTP [label=< <i>BIOS</i> >, fontsize=11];
-    PXE -> TFTP;
-    TFTP -> ProxyDHCP2;
-    ProxyDHCP2 -> HTTP;
+    Start [shape=doubleoctagon];
+    ProxyDHCP [label="Offer ProxyDHCP"];
+    PXE [label="Send PXE boot config"];
+    TFTP [label=< Send iPXE<br/>(TFTP) >];
+    ProxyDHCP_Ipxe [label=< Offer ProxyDHCP<br/>(to iPXE) >];
+    HTTP_Ipxe_Script [label=< Send iPXE boot script<br/>(HTTP) >];
+    HTTP_Kernel [label=< Send kernel<br/>(HTTP) >];
+    HTTP_Initrd [label=< Send initrd(s)<br/>(HTTP) >];
+    Booted [shape=doubleoctagon];
+
+    Start -> ProxyDHCP [label=< <i>DHCP request</i> >, fontsize=11];
+    ProxyDHCP -> PXE [label=< <i>PXE request</i><br/><i>(UEFI only)</i> >, fontsize=11];
+    ProxyDHCP -> TFTP [label=< <i>TFTP request</i><br/><i>(BIOS only)</i> >, fontsize=11];
+    PXE -> TFTP [label=< <i>TFTP request</i> >, fontsize=11];
+    TFTP -> ProxyDHCP_Ipxe [label=< <i>DHCP request</i><br/><i>(from iPXE)</i> >, fontsize=11];
+    ProxyDHCP_Ipxe -> HTTP_Ipxe_Script [label=< <i>Request boot script</i> >, fontsize=11];
+    HTTP_Ipxe_Script -> HTTP_Kernel [label=< <i>Request kernel</i> >, fontsize=11];
+    HTTP_Kernel -> HTTP_Initrd [label=< <i>Request initrd(s)</i> >, fontsize=11];
+    HTTP_Initrd -> Booted;
 }
diff --git a/pixiecore/bootgraph.svg b/pixiecore/bootgraph.svg
index 71deadc..aed49b5 100644
--- a/pixiecore/bootgraph.svg
+++ b/pixiecore/bootgraph.svg
@@ -4,66 +4,134 @@
 <!-- Generated by graphviz version 2.38.0 (20140413.2041)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="177pt" height="347pt"
- viewBox="0.00 0.00 176.99 347.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 343)">
+<svg width="296pt" height="830pt"
+ viewBox="0.00 0.00 295.59 829.70" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 825.701)">
 <title>G</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-343 172.985,-343 172.985,4 -4,4"/>
-<!-- ProxyDHCP1 -->
-<g id="node1" class="node"><title>ProxyDHCP1</title>
-<ellipse fill="none" stroke="black" cx="81.4925" cy="-321" rx="57.3905" ry="18"/>
-<text text-anchor="middle" x="81.4925" y="-317.3" font-family="Times,serif" font-size="14.00">ProxyDHCP</text>
+<polygon fill="white" stroke="none" points="-4,4 -4,-825.701 291.592,-825.701 291.592,4 -4,4"/>
+<!-- Start -->
+<g id="node1" class="node"><title>Start</title>
+<polygon fill="none" stroke="black" points="214.623,-792.245 214.623,-807.156 197.031,-817.701 172.152,-817.701 154.561,-807.156 154.561,-792.245 172.152,-781.701 197.031,-781.701 214.623,-792.245"/>
+<polygon fill="none" stroke="black" points="218.594,-789.97 218.594,-809.431 198.123,-821.701 171.06,-821.701 150.59,-809.431 150.59,-789.97 171.06,-777.701 198.123,-777.701 218.594,-789.97"/>
+<text text-anchor="middle" x="184.592" y="-796.001" font-family="Times,serif" font-size="14.00">Start</text>
+</g>
+<!-- ProxyDHCP -->
+<g id="node2" class="node"><title>ProxyDHCP</title>
+<ellipse fill="none" stroke="black" cx="184.592" cy="-711.701" rx="79.0865" ry="18"/>
+<text text-anchor="middle" x="184.592" y="-708.001" font-family="Times,serif" font-size="14.00">Offer ProxyDHCP</text>
+</g>
+<!-- Start&#45;&gt;ProxyDHCP -->
+<g id="edge1" class="edge"><title>Start&#45;&gt;ProxyDHCP</title>
+<path fill="none" stroke="black" d="M184.592,-777.442C184.592,-766.132 184.592,-752.098 184.592,-739.99"/>
+<polygon fill="black" stroke="black" points="188.092,-739.963 184.592,-729.963 181.092,-739.963 188.092,-739.963"/>
+<text text-anchor="start" x="184.592" y="-751.901" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="188.592" y="-751.901" font-family="Times,serif" font-style="italic" font-size="11.00">DHCP request</text>
+<text text-anchor="start" x="257.592" y="-751.901" font-family="Times,serif" font-size="11.00"> </text>
 </g>
 <!-- PXE -->
 <g id="node3" class="node"><title>PXE</title>
-<ellipse fill="none" stroke="black" cx="42.4925" cy="-237" rx="27.8951" ry="18"/>
-<text text-anchor="middle" x="42.4925" y="-233.3" font-family="Times,serif" font-size="14.00">PXE</text>
+<ellipse fill="none" stroke="black" cx="93.5917" cy="-617.701" rx="93.6835" ry="18"/>
+<text text-anchor="middle" x="93.5917" y="-614.001" font-family="Times,serif" font-size="14.00">Send PXE boot config</text>
 </g>
-<!-- ProxyDHCP1&#45;&gt;PXE -->
-<g id="edge1" class="edge"><title>ProxyDHCP1&#45;&gt;PXE</title>
-<path fill="none" stroke="black" d="M69.1248,-303.068C65.393,-297.49 61.4946,-291.14 58.4925,-285 55.3383,-278.549 52.5425,-271.319 50.2059,-264.5"/>
-<polygon fill="black" stroke="black" points="53.524,-263.385 47.1229,-254.943 46.862,-265.534 53.524,-263.385"/>
-<text text-anchor="start" x="58.4925" y="-277.2" font-family="Times,serif" font-size="11.00"> </text>
-<text text-anchor="start" x="62.4925" y="-277.2" font-family="Times,serif" font-style="italic" font-size="11.00">UEFI</text>
-<text text-anchor="start" x="88.4925" y="-277.2" font-family="Times,serif" font-size="11.00"> </text>
+<!-- ProxyDHCP&#45;&gt;PXE -->
+<g id="edge2" class="edge"><title>ProxyDHCP&#45;&gt;PXE</title>
+<path fill="none" stroke="black" d="M166.712,-694.16C160.58,-688.39 153.721,-681.826 147.592,-675.701 137.142,-665.258 125.862,-653.442 116.327,-643.286"/>
+<polygon fill="black" stroke="black" points="118.804,-640.811 109.419,-635.894 113.69,-645.59 118.804,-640.811"/>
+<text text-anchor="start" x="147.592" y="-667.901" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="151.592" y="-667.901" font-family="Times,serif" font-style="italic" font-size="11.00">PXE request</text>
+<text text-anchor="start" x="148.092" y="-656.901" font-family="Times,serif" font-style="italic" font-size="11.00">(UEFI only)</text>
+<text text-anchor="start" x="205.092" y="-656.901" font-family="Times,serif" font-size="11.00"> </text>
 </g>
 <!-- TFTP -->
 <g id="node4" class="node"><title>TFTP</title>
-<ellipse fill="none" stroke="black" cx="84.4925" cy="-164" rx="33.2948" ry="18"/>
-<text text-anchor="middle" x="84.4925" y="-160.3" font-family="Times,serif" font-size="14.00">TFTP</text>
+<ellipse fill="none" stroke="black" cx="169.592" cy="-524.831" rx="57.9655" ry="26.7407"/>
+<text text-anchor="start" x="136.592" y="-528.631" font-family="Times,serif" font-size="14.00"> Send iPXE</text>
+<text text-anchor="start" x="145.592" y="-513.631" font-family="Times,serif" font-size="14.00">(TFTP) </text>
 </g>
-<!-- ProxyDHCP1&#45;&gt;TFTP -->
-<g id="edge2" class="edge"><title>ProxyDHCP1&#45;&gt;TFTP</title>
-<path fill="none" stroke="black" d="M88.0414,-302.801C89.8601,-297.209 91.5844,-290.918 92.4925,-285 97.3475,-253.359 93.5182,-216.578 89.665,-192.161"/>
-<polygon fill="black" stroke="black" points="93.0975,-191.468 87.9808,-182.191 86.1953,-192.634 93.0975,-191.468"/>
-<text text-anchor="start" x="95.4925" y="-235.2" font-family="Times,serif" font-size="11.00"> </text>
-<text text-anchor="start" x="99.4925" y="-235.2" font-family="Times,serif" font-style="italic" font-size="11.00">BIOS</text>
-<text text-anchor="start" x="124.493" y="-235.2" font-family="Times,serif" font-size="11.00"> </text>
-</g>
-<!-- ProxyDHCP2 -->
-<g id="node2" class="node"><title>ProxyDHCP2</title>
-<ellipse fill="none" stroke="black" cx="84.4925" cy="-91" rx="84.485" ry="18"/>
-<text text-anchor="middle" x="84.4925" y="-87.3" font-family="Times,serif" font-size="14.00">ProxyDHCP (iPXE)</text>
-</g>
-<!-- HTTP -->
-<g id="node5" class="node"><title>HTTP</title>
-<ellipse fill="none" stroke="black" cx="84.4925" cy="-18" rx="34.394" ry="18"/>
-<text text-anchor="middle" x="84.4925" y="-14.3" font-family="Times,serif" font-size="14.00">HTTP</text>
-</g>
-<!-- ProxyDHCP2&#45;&gt;HTTP -->
-<g id="edge5" class="edge"><title>ProxyDHCP2&#45;&gt;HTTP</title>
-<path fill="none" stroke="black" d="M84.4925,-72.8129C84.4925,-64.7895 84.4925,-55.0475 84.4925,-46.0691"/>
-<polygon fill="black" stroke="black" points="87.9926,-46.0288 84.4925,-36.0288 80.9926,-46.0289 87.9926,-46.0288"/>
+<!-- ProxyDHCP&#45;&gt;TFTP -->
+<g id="edge3" class="edge"><title>ProxyDHCP&#45;&gt;TFTP</title>
+<path fill="none" stroke="black" d="M199.907,-693.71C203.842,-688.326 207.541,-682.101 209.592,-675.701 216.031,-655.605 229.288,-625.835 207.592,-569.701 205.954,-565.462 203.714,-561.356 201.134,-557.467"/>
+<polygon fill="black" stroke="black" points="203.842,-555.242 195.049,-549.332 198.236,-559.436 203.842,-555.242"/>
+<text text-anchor="start" x="219.592" y="-620.901" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="223.592" y="-620.901" font-family="Times,serif" font-style="italic" font-size="11.00">TFTP request</text>
+<text text-anchor="start" x="223.592" y="-609.901" font-family="Times,serif" font-style="italic" font-size="11.00">(BIOS only)</text>
+<text text-anchor="start" x="279.592" y="-609.901" font-family="Times,serif" font-size="11.00"> </text>
 </g>
 <!-- PXE&#45;&gt;TFTP -->
-<g id="edge3" class="edge"><title>PXE&#45;&gt;TFTP</title>
-<path fill="none" stroke="black" d="M52.023,-219.889C57.2114,-211.118 63.7473,-200.069 69.5927,-190.188"/>
-<polygon fill="black" stroke="black" points="72.6293,-191.929 74.7083,-181.54 66.6045,-188.365 72.6293,-191.929"/>
+<g id="edge4" class="edge"><title>PXE&#45;&gt;TFTP</title>
+<path fill="none" stroke="black" d="M107.887,-599.609C117.664,-587.919 130.926,-572.061 142.65,-558.043"/>
+<polygon fill="black" stroke="black" points="145.607,-559.964 149.337,-550.048 140.237,-555.473 145.607,-559.964"/>
+<text text-anchor="start" x="131.592" y="-573.901" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="135.592" y="-573.901" font-family="Times,serif" font-style="italic" font-size="11.00">TFTP request</text>
+<text text-anchor="start" x="199.592" y="-573.901" font-family="Times,serif" font-size="11.00"> </text>
 </g>
-<!-- TFTP&#45;&gt;ProxyDHCP2 -->
-<g id="edge4" class="edge"><title>TFTP&#45;&gt;ProxyDHCP2</title>
-<path fill="none" stroke="black" d="M84.4925,-145.813C84.4925,-137.789 84.4925,-128.047 84.4925,-119.069"/>
-<polygon fill="black" stroke="black" points="87.9926,-119.029 84.4925,-109.029 80.9926,-119.029 87.9926,-119.029"/>
+<!-- ProxyDHCP_Ipxe -->
+<g id="node5" class="node"><title>ProxyDHCP_Ipxe</title>
+<ellipse fill="none" stroke="black" cx="169.592" cy="-413.09" rx="88.2768" ry="26.7407"/>
+<text text-anchor="start" x="115.092" y="-416.89" font-family="Times,serif" font-size="14.00"> Offer ProxyDHCP</text>
+<text text-anchor="start" x="140.592" y="-401.89" font-family="Times,serif" font-size="14.00">(to iPXE) </text>
+</g>
+<!-- TFTP&#45;&gt;ProxyDHCP_Ipxe -->
+<g id="edge5" class="edge"><title>TFTP&#45;&gt;ProxyDHCP_Ipxe</title>
+<path fill="none" stroke="black" d="M169.592,-497.824C169.592,-483.713 169.592,-466.043 169.592,-450.576"/>
+<polygon fill="black" stroke="black" points="173.092,-450.291 169.592,-440.291 166.092,-450.291 173.092,-450.291"/>
+<text text-anchor="start" x="169.592" y="-472.16" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="173.592" y="-472.16" font-family="Times,serif" font-style="italic" font-size="11.00">DHCP request</text>
+<text text-anchor="start" x="176.092" y="-461.16" font-family="Times,serif" font-style="italic" font-size="11.00">(from iPXE)</text>
+<text text-anchor="start" x="232.092" y="-461.16" font-family="Times,serif" font-size="11.00"> </text>
+</g>
+<!-- HTTP_Ipxe_Script -->
+<g id="node6" class="node"><title>HTTP_Ipxe_Script</title>
+<ellipse fill="none" stroke="black" cx="169.592" cy="-311.35" rx="103.889" ry="26.7407"/>
+<text text-anchor="start" x="104.092" y="-315.15" font-family="Times,serif" font-size="14.00"> Send iPXE boot script</text>
+<text text-anchor="start" x="145.092" y="-300.15" font-family="Times,serif" font-size="14.00">(HTTP) </text>
+</g>
+<!-- ProxyDHCP_Ipxe&#45;&gt;HTTP_Ipxe_Script -->
+<g id="edge6" class="edge"><title>ProxyDHCP_Ipxe&#45;&gt;HTTP_Ipxe_Script</title>
+<path fill="none" stroke="black" d="M169.592,-386.145C169.592,-374.691 169.592,-361.031 169.592,-348.595"/>
+<polygon fill="black" stroke="black" points="173.092,-348.512 169.592,-338.512 166.092,-348.512 173.092,-348.512"/>
+<text text-anchor="start" x="169.592" y="-360.42" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="173.592" y="-360.42" font-family="Times,serif" font-style="italic" font-size="11.00">Request boot script</text>
+<text text-anchor="start" x="264.592" y="-360.42" font-family="Times,serif" font-size="11.00"> </text>
+</g>
+<!-- HTTP_Kernel -->
+<g id="node7" class="node"><title>HTTP_Kernel</title>
+<ellipse fill="none" stroke="black" cx="169.592" cy="-209.61" rx="60.623" ry="26.7407"/>
+<text text-anchor="start" x="134.592" y="-213.41" font-family="Times,serif" font-size="14.00"> Send kernel</text>
+<text text-anchor="start" x="145.092" y="-198.41" font-family="Times,serif" font-size="14.00">(HTTP) </text>
+</g>
+<!-- HTTP_Ipxe_Script&#45;&gt;HTTP_Kernel -->
+<g id="edge7" class="edge"><title>HTTP_Ipxe_Script&#45;&gt;HTTP_Kernel</title>
+<path fill="none" stroke="black" d="M169.592,-284.405C169.592,-272.951 169.592,-259.291 169.592,-246.855"/>
+<polygon fill="black" stroke="black" points="173.092,-246.772 169.592,-236.772 166.092,-246.772 173.092,-246.772"/>
+<text text-anchor="start" x="169.592" y="-258.68" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="173.592" y="-258.68" font-family="Times,serif" font-style="italic" font-size="11.00">Request kernel</text>
+<text text-anchor="start" x="243.592" y="-258.68" font-family="Times,serif" font-size="11.00"> </text>
+</g>
+<!-- HTTP_Initrd -->
+<g id="node8" class="node"><title>HTTP_Initrd</title>
+<ellipse fill="none" stroke="black" cx="169.592" cy="-107.87" rx="67.7647" ry="26.7407"/>
+<text text-anchor="start" x="129.592" y="-111.67" font-family="Times,serif" font-size="14.00"> Send initrd(s)</text>
+<text text-anchor="start" x="145.092" y="-96.6701" font-family="Times,serif" font-size="14.00">(HTTP) </text>
+</g>
+<!-- HTTP_Kernel&#45;&gt;HTTP_Initrd -->
+<g id="edge8" class="edge"><title>HTTP_Kernel&#45;&gt;HTTP_Initrd</title>
+<path fill="none" stroke="black" d="M169.592,-182.665C169.592,-171.211 169.592,-157.551 169.592,-145.115"/>
+<polygon fill="black" stroke="black" points="173.092,-145.032 169.592,-135.032 166.092,-145.032 173.092,-145.032"/>
+<text text-anchor="start" x="169.592" y="-156.94" font-family="Times,serif" font-size="11.00"> </text>
+<text text-anchor="start" x="173.592" y="-156.94" font-family="Times,serif" font-style="italic" font-size="11.00">Request initrd(s)</text>
+<text text-anchor="start" x="251.592" y="-156.94" font-family="Times,serif" font-size="11.00"> </text>
+</g>
+<!-- Booted -->
+<g id="node9" class="node"><title>Booted</title>
+<polygon fill="none" stroke="black" points="210.215,-14.5442 210.215,-29.4558 186.419,-40 152.765,-40 128.968,-29.4558 128.968,-14.5442 152.765,-4 186.419,-4 210.215,-14.5442"/>
+<polygon fill="none" stroke="black" points="214.198,-11.9368 214.198,-32.0632 187.258,-44 151.925,-44 124.986,-32.0632 124.986,-11.9368 151.925,-3.55271e-15 187.258,-0 214.198,-11.9368"/>
+<text text-anchor="middle" x="169.592" y="-18.3" font-family="Times,serif" font-size="14.00">Booted</text>
+</g>
+<!-- HTTP_Initrd&#45;&gt;Booted -->
+<g id="edge9" class="edge"><title>HTTP_Initrd&#45;&gt;Booted</title>
+<path fill="none" stroke="black" d="M169.592,-80.7928C169.592,-72.3829 169.592,-62.9752 169.592,-54.2325"/>
+<polygon fill="black" stroke="black" points="173.092,-54.01 169.592,-44.0101 166.092,-54.0101 173.092,-54.01"/>
 </g>
 </g>
 </svg>