--- a/src/Application.hh	Tue Jan 20 23:30:18 2009 +0200
+++ b/src/Application.hh	Wed Jan 21 00:21:42 2009 +0200
@@ -23,28 +23,34 @@
         /**
          * --graphics
          */
-        bool arg_graphics;
+        bool graphics_enabled;
+
+        /**
+         * --fullscreen and --resolution
+         */
+        GraphicsConfig graphics;
+
+        /**
+         * --terrain-seed and --terrain-size
+         */
+        TerrainConfig terrain;
 
         /**
          * --port
          */
-        std::string arg_port;
+        std::string net_port;
 
         /**
          * --server
          */
-        bool arg_server;
+        bool net_server;
 
         /**
          * --connect
          */
-        std::string arg_connect;
-
-        /**
-         * --fullscreen and --resolution
-         */
-        GraphicsConfiguration graphics;
-
+        std::string net_connect;
+        
+        
         /**
          * Set the arg_* members
          *
@@ -53,9 +59,14 @@
         bool parse_args (int argc, char **argv);
 
         /**
-         * Parse and set --resolution/arg_resolution WIDTHxHEIGHT
+         * Parse signed integer argument
          */
-        void parse_arg_resolution (const std::string &val);
+        int parse_arg_int (const std::string &arg_val, const char *arg_name);
+
+        /**
+         * Parse unsigned WIDTHxHEIGHT argument
+         */
+        PixelCoordinate parse_arg_dimensions (const std::string &arg_val, const char *arg_name);
         
         /**
          * Print out a list of display modes
@@ -69,6 +80,11 @@
 
     public:
         /**
+         * Setup default values
+         */
+        Main (void);
+
+        /**
          * IT BEGAN IN AFRIKA
          */
         virtual int main (int argc, char **argv);