diff --git a/aif.xml b/aif.xml
index f63fc45..692c68f 100644
--- a/aif.xml
+++ b/aif.xml
@@ -5,5 +5,74 @@
             <part num="1" size="10%" fstype="ef00" />
             <part num="2" size="90%" fstype="8300" />
         </disk>
+        <mount source="/dev/sda1" mountpt="/mnt" />
     </storage>
+    <network hostname="aiftest.square-r00t.net">
+        <iface name="auto" addressing="dhcp" />
+    </network>
+    <system timezone="EST5EDT" locale="en_US.UTF-8" />
+    <user>
+        <!-- note: all password hashes below are "test"; don't waste your time trying to crack. :) -->
+        <root>
+            <password>$6$3YPpiS.l3SQC6ELe$NQ4qMvcDpv5j1cCM6AGNc5Hyg.rsvtzCt2VWlSbuZXCGg2GB21CMUN8TMGS35tdUezZ/n9y3UFGlmLRVWXvZR.</password>
+        </root>
+        <regusr>
+            <username>aifusr</username>
+            <comment>A test user for AIF.</comment>
+            <sudo>true</sudo>
+            <group>aifusr</group>
+            <password>$6$WtxZKOyaahvvWQRG$TUys60kQhF0ffBdnDSJVTA.PovwCOajjMz8HEHL2H0ZMi0bFpDTQvKA7BqzM3nA.ZMAUxNjpJP1dG/eA78Zgw0</password>
+            <homedir path="/home/aifusr" create="true" />
+            <xgroup name="admins" />
+            <xgroup name="wheel" />
+            <xgroup name="users" />
+        </regusr>
+    </user>
+    <pacman>
+        <repos>
+            <core>
+                <status>enabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </core>
+            <extra>
+                <status>enabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </extra>
+            <community>
+                <status>enabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </community>
+            <multilib>
+                <status>disabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </multilib>
+            <testing>
+                <status>disabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </testing>
+            <multilib-testing>
+                <status>disabled</status>
+                <mirror>Include = /etc/pacman.d/mirrorlist</mirror>
+            </multilib-testing>
+            <custom name="archlinuxfr">
+                <status>disabled</status>
+                <mirror>http://repo.archlinux.fr/$arch</mirror>
+                <siglevel>Never</siglevel>
+            </custom>
+        </repos>
+        <mirrorlist>
+            <server>http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch</server>
+            <server>http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch</server>
+            <server>http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch</server>
+            <server>http://arch.mirrors.ionfish.org/$repo/os/$arch</server>
+            <server>http://mirrors.gigenet.com/archlinux/$repo/os/$arch</server>
+            <server>http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch</server>
+        </mirrorlist>
+        <software>
+            <package name="sed" repo="core" />
+        </software>
+    </pacman>
+    <bootloader>
+        <type>GRUB</type>
+    </bootloader>
 </aif>
\ No newline at end of file
diff --git a/aif.xsd b/aif.xsd
index b09f8cb..64f4e14 100644
--- a/aif.xsd
+++ b/aif.xsd
@@ -24,7 +24,8 @@
 
 <!-- BEGIN NETWORK -->
 <xs:element name="network">
-    <xs:element name="interface"><!-- the interface name, e.g. 'enp3s0'. if set to 'auto', use the first ethernet device we find. -->
+    <xs:element name="iface"><!-- an interface -->
+        <xs:element name="device" /><!-- the interface name, e.g. 'enp3s0'. if set to 'auto', use the first ethernet device we find. -->
         <xs:element name="addressing" /><!-- i.e. 'dhcp', 'static', etc. -->
         <xs:element name="ipaddr" /><!-- the IP address and netmask to assign if set as static. -->
     </xs:element>
@@ -52,7 +53,9 @@
             <xs:element name="create" /><!-- create the user's homedir. boolean. default is yes. -->
         </xs:element>
         <xs:element name="group" /><!-- the user's primary group. optional; if not specified, one will be created that matches the username. -->
-        <xs:element name="xgroup" /><!-- an extra group to add the user to. -->
+        <xs:element name="xgroup"><!-- an extra group to add the user to. -->
+            <xs:element name="name" /><!-- the name of the group -->
+        </xs:element>
         <xs:element name="password" /><!-- see user/root/password -->
         <xs:element name="comment" /><!-- the description of the user. optional. -->
         <xs:element name="sudo" /><!-- whether or not to give the user FULL sudo privileges. boolean. no if unspecified. -->
@@ -88,7 +91,8 @@
             <xs:element name="status" /><!-- one of "enabled" or "disabled". assume disabled by default. -->
             <xs:element name="mirror" /><!-- the URI for the mirror for the repo, or an Include directive. -->
         </xs:element>
-        <xs:element name="custom"><!-- "[custom]", or whatever the repository's name should be per the repo. can specify multiple of these. -->
+        <xs:element name="custom"><!-- "[custom]" -->
+            <xs:element name="name" /><!-- whatever the repository's name should be per the repo. can specify multiple of these. -->
             <xs:element name="status" /><!-- one of "enabled" or "disabled". assume disabled by default. -->
             <xs:element name="siglevel" /><!-- the siglevel. one element specified per additional trust level. if none provided, default is "Optional" and "TrustAll". -->
             <xs:element name="mirror" /><!-- the URI for the mirror for the repo, or an Include directive. -->