diff --git a/cod-dev.make b/cod-dev.make
index 0dc86e9141a96037b1d1344861b614b61028b09f..38cda82cac0ecc90f914d0bc37f344e85f23b902 100644
--- a/cod-dev.make
+++ b/cod-dev.make
@@ -3,11 +3,11 @@
 ; the dev version of COD and its dependencies, including patches, before
 ; a new full release of the distribution is rolled.
 api = 2
-core = 7.x
+core = 7.15
 
-projects[drupal] = 7.10
+projects[drupal] = 7.15
 
-projects[cod][type] = profile
+projects[cod][type] = "module"
 projects[cod][download][type] = "git"
 projects[cod][download][url] = "http://git.drupal.org/project/cod.git"
-projects[cod][download][revision] = "7.x-1.x"
\ No newline at end of file
+projects[cod][download][branch] = "7.x-1.x"
\ No newline at end of file
diff --git a/cod-stable.make b/cod-stable.make
deleted file mode 100644
index 63c8695a01db60b55376417ba807e222c1758ce6..0000000000000000000000000000000000000000
--- a/cod-stable.make
+++ /dev/null
@@ -1,9 +0,0 @@
-api = 2
-core = 6.x
-
-projects[drupal] = 6.20
-
-projects[cod][type] = profile
-projects[cod][download][type] = "git"
-projects[cod][download][url] = "http://git.drupal.org/project/cod.git"
-projects[cod][download][revision] = "6.x-1.0-alpha3"
\ No newline at end of file
diff --git a/cod.info b/cod.info
new file mode 100644
index 0000000000000000000000000000000000000000..fd65bcc0057553ed4bb4207549971dea911884d6
--- /dev/null
+++ b/cod.info
@@ -0,0 +1,76 @@
+;This is a development version. Therefore most cod modules are disabled by default, and devel modules are enabled.
+name = COD
+description = Conference Organization Distribution
+version = 7.x-1.0
+core = 7.x
+dependencies[] = addressfield
+dependencies[] = admin
+dependencies[] = admin_menu
+dependencies[] = advanced_help
+dependencies[] = auto_nodetitle
+dependencies[] = block
+dependencies[] = comment
+dependencies[] = content_access
+dependencies[] = context
+dependencies[] = contextual
+dependencies[] = context_ui
+dependencies[] = ctools
+dependencies[] = dashboard
+dependencies[] = date
+dependencies[] = date_api
+dependencies[] = date_popup
+dependencies[] = dblog
+dependencies[] = devel
+dependencies[] = devel_generate
+dependencies[] = diff
+dependencies[] = entity
+dependencies[] = entityreference
+dependencies[] = entityreference_prepopulate
+dependencies[] = entity_token
+dependencies[] = features
+dependencies[] = field
+dependencies[] = field_group
+dependencies[] = field_permissions
+dependencies[] = field_sql_storage
+dependencies[] = field_ui
+dependencies[] = file
+dependencies[] = filter
+dependencies[] = flag
+dependencies[] = forum
+dependencies[] = image
+dependencies[] = link
+dependencies[] = list
+dependencies[] = menu
+dependencies[] = node
+dependencies[] = number
+dependencies[] = options
+dependencies[] = path
+dependencies[] = pathauto
+dependencies[] = quicktabs
+dependencies[] = quicktabs_tabstyles
+dependencies[] = rules
+dependencies[] = rules_admin
+dependencies[] = search
+dependencies[] = strongarm
+dependencies[] = system
+dependencies[] = text
+dependencies[] = token
+dependencies[] = update
+dependencies[] = user
+dependencies[] = views
+dependencies[] = views_bulk_operations
+dependencies[] = views_content
+dependencies[] = views_data_export
+dependencies[] = views_ui
+dependencies[] = webform
+;disable UUID for now, its causing a WSOD upon install
+;dependencies[] = uuid
+;dependencies[] = uuid_features
+dependencies[] = cod_base
+;dependencies[] = cod_session
+;dependencies[] = cod_events
+;dependencies[] = cod_community
+;dependencies[] = cod_front_page
+;dependencies[] = cod_news
+;dependencies[] = cod_sponsors
+files[] = cod.profile
\ No newline at end of file
diff --git a/cod.make b/cod.make
index d5513742969adedebc04eaa504f33c239b0cdf5a..8dfc489a1b9b1f037ba6c341c84bc12655d1bba5 100644
--- a/cod.make
+++ b/cod.make
@@ -1,190 +1,99 @@
-; Conference Organizing Distribution dev snapshot makefile
-; The purpose of this makefile is to make it easier for people to install
-; the dev version of COD and its dependencies, including patches, before
-; a new full release of the distribution is rolled.
-
+; This file was auto-generated by drush make
+core = 7.15
 api = 2
-core = 7.x
-
-; Required versions of Drupal contributed projects.
-
-;Admin
-projects[admin][install_path] = sites/all/modules/contrib
-projects[admin][download][type] = "git"
-projects[admin][download][url] = "http://git.drupal.org/project/admin.git"
-projects[admin][download][revision] = "7.x-2.x"
-
-;Automatic Nodetitles
-projects[auto_nodetitle][install_path] = sites/all/modules/contrib
-projects[auto_nodetitle][download][type] = "git"
-projects[auto_nodetitle][download][url] = "http://git.drupal.org/project/auto_nodetitle.git"
-projects[auto_nodetitle][download][revision] = "7.x-1.x"
-
-;Comment Notify
-projects[comment_notify][install_path] = sites/all/modules/contrib
-projects[comment_notify][download][type] = "git"
-projects[comment_notify][download][url] = "http://git.drupal.org/project/comment_notify.git"
-projects[comment_notify][download][revision] = "7.x-1.x"
-
-;Context
-projects[context][install_path] = sites/all/modules/contrib
-projects[context][download][type] = "git"
-projects[context][download][url] = "http://git.drupal.org/project/context.git"
-projects[context][download][revision] = "7.x-3.x"
-
-;Chaos tool suite
-projects[ctools][install_path] = sites/all/modules/contrib
-projects[ctools][download][type] = "git"
-projects[ctools][download][url] = "http://git.drupal.org/project/ctools.git"
-projects[ctools][download][revision] = "7.x-1.x"
-
-;Strongarm
-projects[strongarm][install_path] = sites/all/modules/contrib
-projects[strongarm][download][type] = "git"
-projects[strongarm][download][url] = "http://git.drupal.org/project/strongarm.git"
-projects[strongarm][download][revision] = "7.x-2.x"
-
-;Link
-projects[link][install_path] = sites/all/modules/contrib
-projects[link][download][type] = "git"
-projects[link][download][url] = "http://git.drupal.org/project/link.git"
-projects[link][download][revision] = "7.x-1.x"
-
-;Date
-projects[date][install_path] = sites/all/modules/contrib
-projects[date][download][type] = "git"
-projects[date][download][url] = "http://git.drupal.org/project/date.git"
-projects[date][download][revision] = "7.x-2.x"
-
-;Diff
-projects[diff][install_path] = sites/all/modules/contrib
-projects[diff][download][type] = "git"
-projects[diff][download][url] = "http://git.drupal.org/project/diff.git"
-projects[diff][download][revision] = "7.x-2.x"
-
-;Flag
-projects[flag][install_path] = sites/all/modules/contrib
-projects[flag][download][type] = "git"
-projects[flag][download][url] = "http://git.drupal.org/project/flag.git"
-projects[flag][download][branch] = "master"
-
-;Features
-projects[features][install_path] = sites/all/modules/contrib
-projects[features][download][type] = "git"
-projects[features][download][url] = "http://git.drupal.org/project/features.git"
-projects[features][download][branch] = "7.x-1.x"
-
-;Global Redirect
-projects[globalredirect][install_path] = sites/all/modules/contrib
-projects[globalredirect][download][type] = "git"
-projects[globalredirect][download][url] = "http://git.drupal.org/project/globalredirect.git"
-projects[globalredirect][download][revision] = "7.x-1.x"
-
-;ImageAPI
-projects[imageapi][install_path] = sites/all/modules/contrib
-projects[imageapi][download][type] = "git"
-projects[imageapi][download][url] = "http://git.drupal.org/project/imageapi.git"
-projects[imageapi][download][revision] = "master"
-
-;jQuery UI
-projects[jquery_ui][install_path] = sites/all/modules/contrib
-projects[jquery_ui][download][type] = "git"
-projects[jquery_ui][download][url] = "http://git.drupal.org/project/jquery_ui.git"
-projects[jquery_ui][download][revision] = "7.x-1.x"
-
-;Markdown filter
-projects[markdown][install_path] = sites/all/modules/contrib
-projects[markdown][download][type] = "git"
-projects[markdown][download][url] = "http://git.drupal.org/project/markdown.git"
-projects[markdown][download][revision] = "7.x-1.x"
-
-;Pathauto
-projects[pathauto][install_path] = sites/all/modules/contrib
-projects[pathauto][download][type] = "git"
-projects[pathauto][download][url] = "http://git.drupal.org/project/pathauto.git"
-projects[pathauto][download][revision] = "7.x-1.x"
-
-;Redirect
-projects[redirect][install_path] = sites/all/modules/contrib
-projects[redirect][download][type] = "git"
-projects[redirect][download][url] = "http://git.drupal.org/project/redirect.git"
-projects[redirect][download][revision] = "7.x-1.x"
-
-;Skinr
-projects[skinr][install_path] = sites/all/modules/contrib
-projects[skinr][download][type] = "git"
-projects[skinr][download][url] = "http://git.drupal.org/project/skinr.git"
-projects[skinr][download][revision] = "7.x-1.x"
-
-;Signup
-projects[signup][install_path] = sites/all/modules/contrib
-projects[signup][download][type] = "git"
-projects[signup][download][url] = "http://git.drupal.org/project/signup.git"
-projects[signup][download][revision] = "7.x-1.x"
-
-;Token
-projects[token][install_path] = sites/all/modules/contrib
-projects[token][download][type] = "git"
-projects[token][download][url] = "http://git.drupal.org/project/token.git"
-projects[token][download][revision] = "7.x-1.x"
-
-;Universally Unique IDentifier
-projects[uuid][install_path] = sites/all/modules/contrib
-projects[uuid][download][type] = "git"
-projects[uuid][download][url] = "http://git.drupal.org/project/uuid.git"
-projects[uuid][download][revision] = "7.x-1.x"
 
-;UUID Features Integration
-projects[uuid_features][install_path] = sites/all/modules/contrib
-projects[uuid_features][download][type] = "git"
-projects[uuid_features][download][url] = "http://git.drupal.org/project/uuid_features.git"
-projects[uuid_features][download][revision] = "7.x-1.x"
+; Profiles
+; Please fill the following out. Type may be one of get, git, bzr or svn,
+; and url is the url of the download.
+;projects[cod][type] = "profile"
+
+; Modules
+projects[views_bulk_operations][version] = "3.0-rc1"
+
+projects[addressfield][version] = "1.0-beta3"
+
+projects[admin][version] = "2.0-beta3"
+
+projects[admin_menu][version] = "3.0-rc3"
+
+projects[advanced_help][version] = "1.0"
+
+projects[auto_nodetitle][version] = "1.0"
+
+projects[ctools][version] = "1.1"
+
+;Commerce is disabled for now
+;projects[commerce][version] = "1.3"
+;projects[commerce_stock][version] = "1.1"
+
+projects[content_access][version] = "1.2-beta1"
+
+projects[context][version] = "3.0-beta4"
+
+projects[date][version] = "2.6"
+
+projects[devel][version] = "1.3"
+
+projects[diff][version] = "2.0"
+
+projects[entity][version] = "1.0-rc3"
+
+projects[entityreference][version] = "1.0-rc3"
 
-;Commerce
-projects[commerce][install_path] = sites/all/modules/contrib
-projects[commerce][download][type] = "git"
-projects[commerce][download][url] = http://git.drupal.org/project/commerce.git
-projects[commerce][download][revision] = "7.x-1.x"
+projects[entityreference_prepopulate][version] = "1.0"
 
-;Views
-projects[views][install_path] = sites/all/modules/contrib
+projects[features][version] = "1.0"
 
-;Views Bulk Operations (VBO)
-projects[views_bulk_operations][install_path] = sites/all/modules/contrib
-projects[views_bulk_operations][download][type] = "git"
-projects[views_bulk_operations][download][url] = "http://git.drupal.org/project/views_bulk_operations.git"
-projects[views_bulk_operations][download][revision] = "7.x-3.x"
+projects[field_group][version] = "1.1"
 
-;COD feature modules.
-projects[cod_support][install_path] = sites/all/modules/contrib
+projects[field_permissions][version] = "1.0-beta2"
+
+projects[flag][version] = "2.0-beta8"
+
+projects[link][version] = "1.0"
+
+projects[panels][version] = "3.2"
+
+projects[pathauto][version] = "1.2"
+
+projects[quicktabs][version] = "3.4"
+
+projects[rules][version] = "2.2"
+
+projects[strongarm][version] = "2.0"
+
+projects[token][version] = "1.2"
+
+projects[views][version] = "3.3"
+
+projects[views_data_export][version] = "3.0-beta6"
+
+projects[webform][version] = "3.18"
+
+; Themes
+projects[adaptivetheme][version] = "2.2"
+
+; Modules
+projects[cod_support][type] = "module"
 projects[cod_support][download][type] = "git"
 projects[cod_support][download][url] = "http://git.drupal.org/project/cod_support.git"
-projects[cod_support][download][revision] = "7.x-1.x"
-
-;Fusion
-projects[fusion][type] = theme
-projects[fusion][download][type] = git
-projects[fusion][download][url] = "http://git.drupal.org/project/fusion.git"
-projects[fusion][download][revision] = "master"
-projects[fusion][install_path] = sites/all/themes
-projects[fusion][destination] = fusion
-
-;Libraries
-libraries[jquery_ui][download][type] = "get"
-libraries[jquery_ui][destination] = "jquery_ui"
-libraries[jquery_ui][download][url] = "http://jquery-ui.googlecode.com/files/jquery.ui-1.6.zip"
-libraries[jquery_ui][directory_name] = "jquery.ui"
-libraries[jquery_ui][install_path] = sites/all/modules/contrib
-
-
-; @todo: Is there a commerce_signup? Needs to be checked
-; projects[uc_signup][install_path] = sites/all/modules/contrib
-
-; @todo: These patches probably need to be re-rolled (and ideally, committed to both the D6 and D7 branches)
-; projects[features][download][url] = "http://git.drupal.org/project/features.git"
-; http://drupal.org/node/968826#comment-3863422
-; projects[features][patch][] = "http://drupal.org/files/issues/968826-features-menu-uuid.patch"
-; http://drupal.org/node/912716#comment-3899924
-; projects[features][patch][] ="http://drupal.org/files/issues/features-profile-fields-912716-11.patch"
-; http://drupal.org/node/860974#comment-3505484
-; projects[features][patch][] = "http://drupal.org/files/issues/features.860974.patch"
\ No newline at end of file
+projects[cod_support][download][branch] = "7.x-1.x"
+projects[cod_support][download][revision] = "2059d1eb888df6ff3269f63a447723f4de96a245"
+
+projects[registration][type] = "module"
+projects[registration][download][type] = "git"
+projects[registration][download][url] = "http://git.drupal.org/project/registration.git"
+projects[registration][download][branch] = "7.x-1.x"
+projects[registration][download][revision] = "a88867636cb7122a91715d7acd5c3cc4a37de586"
+
+projects[uuid][type] = "module"
+projects[uuid][download][type] = "git"
+projects[uuid][download][url] = "http://git.drupal.org/project/uuid.git"
+projects[uuid][download][branch] = "7.x-1.x"
+projects[uuid][download][revision] = "806c3011accaa93a835b6d0849b3dfde04c9e139"
+
+projects[uuid_features][type] = "module"
+projects[uuid_features][download][type] = "git"
+projects[uuid_features][download][url] = "http://git.drupal.org/project/uuid_features.git"
+projects[uuid_features][download][branch] = "7.x-1.x"
+projects[uuid_features][download][revision] = "924559bcf71e39c15374fb2b9623df16075f3ccf"
\ No newline at end of file
diff --git a/cod.profile b/cod.profile
index c3f48c3b14338dcf0e4b1c66b9b005b1c08b972e..63786bbe2cc881464a449efcc3980588b17ec5b2 100644
--- a/cod.profile
+++ b/cod.profile
@@ -1,94 +1,17 @@
 <?php
-/**
-* Return an array of the modules to be enabled when this profile is installed.
-*
-* @return
-*  An array of modules to be enabled.
-*/
-function cod_profile_modules() {
-  return array(
-    // Enable required core modules first.
-    'block',
-    'filter',
-    'node',
-    'system',
-    'user',
-    'dblog',
-    // Enable optional core modules next.
-    'comment',
-    'help',
-    'menu',
-    'taxonomy',
-    'path',
-    'profile',
-    // Contrib:
-    'checkbox_validate',
-    'admin',
-    'pathauto',
-    'globalredirect',
-    'path_redirect',
-    'comment_notify',
-    'ctools',
-    'context',
-    'strongarm',
-    'token',
-    'content',
-    'content_permissions',
-    'fieldgroup',
-    'number',
-    'optionwidgets',
-    'text',
-    'filefield',
-    'imagefield',
-    'nodereference',
-    'userreference',
-    'link',
-    'auto_nodetitle',
-    'imageapi',
-    'imageapi_gd',
-    'imagecache',
-    'imagecache_ui',
-    'jquery_ui',
-    'date_api',
-    'date',
-    'date_popup',
-    'date_tools',
-    'date_timezone',
-    'views',
-    'views_ui',
-    'signup',
-    'uc_cart',
-    'ca',
-    'uc_order',
-    'uc_store',
-    'uc_payment',
-    'uc_product',
-    'uc_signup',
-    'flag',
-    'features',
-    'diff',
-    'uuid',
-    'uuid_features',
-    'skinr',
-    // COD features are installed during a profile task.
-  );
-}
 
-/**
-* Return a description of the profile for the initial installation screen.
-*
-* @return
-*   An array with keys 'name' and 'description' describing this profile.
-*/
-function cod_profile_details() {
-  return array(
-    'name' => 'Conference Organizing Distribution',
-    'description' => 'This software will help you organize a conference-style event.',
-  );
+function cod_install_tasks($install_state) {
+  $tasks = array();
+
+  //make sure we have more memory than 196M. if not lets try to increase it.
+  if (ini_get('memory_limit') != '-1' && ini_get('memory_limit') <= '196M') {
+    ini_set('memory_limit', '196M');
+  }
+
 }
 
 /**
- * Helper function defines the COD modules.
+ * Helper function defines the COD modules. -- will use this later so people can select COD features on install. Not useful right now
  */
 function _cod_profile_modules() {
   return array(
@@ -103,135 +26,6 @@ function _cod_profile_modules() {
 }
 
 /**
- * Implementation of hook_profile_task_list().
- */
-function cod_profile_task_list() {
-  $tasks['cod-modules-batch'] = st('Set up COD features');
-  $tasks['cod-cleanup'] = st('Cleanup tasks');
-  return $tasks;
-}
-
-/**
- * Implementation of hook_profile_tasks().
- */
-function cod_profile_tasks(&$task, $url) {
-  $output = '';
-
-  // The profile task is called first.
-  if ($task == 'profile') {
-    // Begin by creating the page content type.
-    $task = 'create-page-type';
-  }
-
-  // Create a page content type.
-  if ($task == 'create-page-type') {
-    $type = array(
-      'type' => 'page',
-      'name' => st('Page'),
-      'module' => 'node',
-      'description' => st("Use the <em>Page</em> content type for mostly static content like the \"About us\" section of a website. By default, a <em>page</em> entry does not allow comments and is not featured on the site's home page."),
-      'custom' => TRUE,
-      'modified' => TRUE,
-      'locked' => FALSE,
-      'help' => '',
-      'min_word_count' => '',
-    );
-
-    $type = (object) _node_type_set_defaults($type);
-    node_type_save($type);
-
-    // Default page to not be promoted and have comments disabled.
-    variable_set('node_options_page', array('status'));
-    variable_set('comment_page', COMMENT_NODE_DISABLED);
-    // Don't display date and author information for page nodes by default.
-    $theme_settings = variable_get('theme_settings', array());
-    $theme_settings['toggle_node_info_page'] = FALSE;
-    variable_set('theme_settings', $theme_settings);
-
-    // Update the menu router information.
-    menu_rebuild();
-
-    // Next is the COD features install task.
-    $task = 'cod-modules';
-  }
-
-  // Install some more modules and maybe localization helpers too
-  if ($task == 'cod-modules') {
-    $modules = _cod_profile_modules();
-    $files = module_rebuild_cache();
-    // Create batch
-    foreach ($modules as $module) {
-      $batch['operations'][] = array('_install_module_batch', array($module, $files[$module]->info['name']));
-    }    
-    $batch['finished'] = '_cod_profile_batch_finished'; // The finish op will set the next task.
-    $batch['title'] = st('Installing @drupal', array('@drupal' => drupal_install_profile_name()));
-    $batch['error_message'] = st('The installation has encountered an error.');
-
-    // Start a batch, switch to 'cod-modules-batch' task. We need to
-    // set the variable here, because batch_process() redirects.
-    variable_set('install_task', 'cod-modules-batch');
-    batch_set($batch);
-    batch_process($url, $url);
-    // Jut for cli installs. We'll never reach here on interactive installs.
-    return;
-  }
-  // We are running a batch task for this profile so basically do nothing and return page
-  if ($task == 'cod-modules-batch') {
-    include_once 'includes/batch.inc';
-    $output = _batch_page();
-  }
-
-  // Our final task, clear caches and revert features.
-  if ($task == 'cod-cleanup') {
-    // This isn't actually necessary as there are no node_access() entries,
-    // but we run it to prevent the "rebuild node access" message from being
-    // shown on install.
-    node_access_rebuild();
-
-    // Rebuild key tables/caches
-    drupal_flush_all_caches();
-    // Set acquia_prosper as the default theme.
-    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' and name ='%s'", 'fusion_core');
-    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' and name ='%s'", 'acquia_prosper');
-    variable_set('theme_default', 'acquia_prosper');
-    // Revert features to be sure everything is setup correctly.
-    $revert = array(
-      'cod_base' => array('variable'),
-      'cod_community' => array('variable'),
-      'cod_events' => array('variable'),
-      'cod_news' => array('variable'),
-      'cod_session' => array('variable'),
-      'cod_sponsors' => array('variable'),
-    );
-    features_revert($revert);
-
-    // Inform installation we are done.
-    $task = 'profile-finished';
-  }
-  return $output;
-}
-
-/**
- * Finished callback for the modules install batch.
- *
- * Advance installer task to cod-cleanup.
- */
-function _cod_profile_batch_finished($success, $results) {
-  variable_set('install_task', 'cod-cleanup');
-}
-
-/**
-* Perform any final installation tasks for this profile.
-*
-* @return
-*   An optional HTML string to display to the user on the final installation
-*   screen.
-*/
-function cod_profile_final() {
-  
-}
-
-/**
  * Implements hook_form_alter().
  * Set COD as the default profile.
  * (copied from Atrium: We use system_form_form_id_alter, otherwise we cannot alter forms.)
@@ -240,4 +34,4 @@ function system_form_install_select_profile_form_alter(&$form, $form_state) {
   foreach ($form['profile'] as $key => $element) {
     $form['profile'][$key]['#value'] = 'cod';
   }
-}
+}
\ No newline at end of file