-int ShowMachineInfo(); /* Show information on a(many) machine(s). */
-int AddMachine(); /* add a new machine to teh database. */
-int UpdateMachine(); /* updates machine information. */
-int DeleteMachine(); /* delete a machine from the database. */
-int MachineToClusterMap(); /* show machines in clusters. */
-int AddMachineToCluster(); /* add a machine to a new cluster. */
-int RemoveMachineFromCluster(); /* remove a machine from a cluster. */
-
-int ShowClusterInfo(); /* Show information about a cluster. */
-int AddCluster(); /* adds a new cluster to the database. */
-int UpdateCluster(); /* updates information about a cluster. */
-int DeleteCluster(); /* removes a cluste from the database. */
-
-int ShowClusterInfo(); /* show information about a cluster. */
-int MachinesInCluster(); /* list all machines in a give cluster. */
-int AddCluster();
-int UpdateCluster(); /* add, update, and delete clusters. */
-int DeleteCluster();
-
-int ShowClusterData(); /* Show, add, and remove data */
-int AddClusterData(); /* associated with a cluster. */
-int RemoveClusterData();
+int ShowMachineInfo(int argc, char **argv);
+int ShowMachineQuery(int argc, char **argv);
+int MachineByOwner(int argc, char **argv);
+int MachineByAcctNumber(int argc, char **argv);
+int AddMachine(int argc, char **argv);
+int UpdateMachine(int argc, char **argv);
+int DeleteMachine(int argc, char **argv);
+int MachineToClusterMap(int argc, char **argv);
+int AddMachineToCluster(int argc, char **argv);
+int RemoveMachineFromCluster(int argc, char **argv);
+
+int ShowClusterInfo(int argc, char **argv);
+int AddCluster(int argc, char **argv);
+int UpdateCluster(int argc, char **argv);
+int DeleteCluster(int argc, char **argv);
+
+int ShowClusterInfo(int argc, char **argv);
+int AddCluster(int argc, char **argv);
+int UpdateCluster(int argc, char **argv);
+int DeleteCluster(int argc, char **argv);
+
+int ShowClusterData(int argc, char **argv);
+int AddClusterData(int argc, char **argv);
+int RemoveClusterData(int argc, char **argv);
+
+int ShowSubnetInfo(int argc, char **argv);
+int AddSubnet(int argc, char **argv);
+int UpdateSubnet(int argc, char **argv);
+int DeleteSubnet(int argc, char **argv);
+
+int ShowCname(int argc, char **argv);
+int AddCname(int argc, char **argv);
+int DeleteCname(int argc, char **argv);
+
+int ShowContainerInfo(int argc, char **argv);
+int AddContainer(int argc, char **argv);
+int UpdateContainer(int argc, char **argv);
+int DeleteContainer(int argc, char **argv);
+int GetSubContainers(int argc, char **argv);
+int MachineToContainerMap(int argc, char **argv);
+int AddMachineToContainer(int argc, char **argv);
+int RemoveMachineFromContainer(int argc, char **argv);
+int GetMachinesOfContainer(int argc, char **argv);