Index: waeup_product/trunk/profiles/default/layouts/accommodation.xml
===================================================================
--- waeup_product/trunk/profiles/default/layouts/accommodation.xml	(revision 204)
+++ waeup_product/trunk/profiles/default/layouts/accommodation.xml	(revision 205)
@@ -23,4 +23,37 @@
   <property name="label_edit">Assigned Beds</property>
   <property name="help">List of beds already assigned to students</property>
+ </widget>
+ <widget name="beds_for_final" meta_type="MultiSelect Widget">
+  <property name="fields"/>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for final</property>
+  <property name="label_edit">Bedspaces for final</property>
+  <property name="help">Name the bedspaces for final year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+ <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
+  <property name="fields"/>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for final</property>
+  <property name="label_edit">Bedspaces for final</property>
+  <property name="help">Name the bedspaces for final year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields"/>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for final</property>
+  <property name="label_edit">Bedspaces for final</property>
+  <property name="help">Name the bedspaces for final year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
  </widget>
  <widget name="beds_per_room" meta_type="Select Widget">
@@ -114,8 +147,11 @@
   </row>
   <row>
-   <cell name="beds_assigned"/>
+   <cell name="beds_for_fresh"/>
   </row>
   <row>
-   <cell name="beds_assigned_list"/>
+   <cell name="beds_for_returning"/>
+  </row>
+  <row>
+   <cell name="beds_for_final"/>
   </row>
  </table>
Index: waeup_product/trunk/profiles/default/schemas/accommodation.xml
===================================================================
--- waeup_product/trunk/profiles/default/schemas/accommodation.xml	(revision 204)
+++ waeup_product/trunk/profiles/default/schemas/accommodation.xml	(revision 205)
@@ -3,4 +3,7 @@
  <field name="beds_assigned" meta_type="CPS Int Field"/>
  <field name="beds_assigned_list" meta_type="CPS String List Field"/>
+ <field name="beds_for_final" meta_type="CPS String List Field"/>
+ <field name="beds_for_fresh" meta_type="CPS String List Field"/>
+ <field name="beds_for_returning" meta_type="CPS String List Field"/>
  <field name="beds_per_room" meta_type="CPS Int Field"/>
  <field name="heading" meta_type="CPS String Field">
@@ -10,4 +13,5 @@
  <field name="nr_of_floors" meta_type="CPS Int Field"/>
  <field name="rooms_per_floor" meta_type="CPS Int Field"/>
+ <field name="study_courses" meta_type="CPS String List Field"/>
  <field name="text" meta_type="CPS String Field">
   <property name="is_searchabletext">True</property>
Index: waeup_product/trunk/profiles/default/toolset.xml
===================================================================
--- waeup_product/trunk/profiles/default/toolset.xml	(revision 204)
+++ 	(revision )
@@ -1,5 +1,0 @@
-<?xml version="1.0"?>
-<tool-setup>
- <required tool_id="portal_waeup"
-           class="Products.WAeUP.tool.WAeUPTool"/>
-</tool-setup>
Index: waeup_product/trunk/profiles/default/vocabularies.xml
===================================================================
--- waeup_product/trunk/profiles/default/vocabularies.xml	(revision 204)
+++ waeup_product/trunk/profiles/default/vocabularies.xml	(revision 205)
@@ -3,37 +3,8 @@
  <property name="title"></property>
  <object name="courselevel" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_additem_display_voc" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_bcs_display_voc" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_content_portal_types_voc"
-    meta_type="CPS Method Vocabulary"/>
- <object name="cpsportlets_content_search_voc" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_content_sort_on_voc" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_language_action_voc" meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_navigation_display_voc"
-    meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_rss_channels_voc"
-    meta_type="CPS Method Vocabulary"/>
- <object name="cpsportlets_syndication_formats_voc"
-    meta_type="CPS Vocabulary"/>
- <object name="cpsportlets_visibility_range_voc" meta_type="CPS Vocabulary"/>
- <object name="dummy_voc" meta_type="CPS Vocabulary"/>
  <object name="faculties" meta_type="CPS Vocabulary"/>
- <object name="forum_tree_voc" meta_type="CPS Vocabulary"/>
- <object name="forum_wf_display_voc" meta_type="CPS Vocabulary"/>
  <object name="get_departments_voc" meta_type="CPS Method Vocabulary"/>
  <object name="get_faculties_voc" meta_type="CPS Method Vocabulary"/>
- <object name="global_roles" meta_type="CPS Vocabulary"/>
- <object name="groups" meta_type="CPS Directory Vocabulary"/>
- <object name="language_voc" meta_type="CPS Vocabulary"/>
- <object name="members" meta_type="CPS Directory Vocabulary"/>
- <object name="navigation_display_mode" meta_type="CPS Vocabulary"/>
- <object name="navigation_filter_listing_ptypes"
-    meta_type="CPS Method Vocabulary"/>
- <object name="navigation_filter_review_state" meta_type="CPS Vocabulary"/>
- <object name="navigation_filter_tree_ptypes"
-    meta_type="CPS Method Vocabulary"/>
- <object name="navigation_sort_direction" meta_type="CPS Vocabulary"/>
- <object name="navigation_sort_listing_by" meta_type="CPS Vocabulary"/>
- <object name="navigation_sort_tree_by" meta_type="CPS Vocabulary"/>
+ <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>
  <object name="nigerian_states" meta_type="CPS Vocabulary"/>
  <object name="range10" meta_type="CPS Vocabulary"/>
@@ -41,8 +12,3 @@
  <object name="range5" meta_type="CPS Vocabulary"/>
  <object name="range50" meta_type="CPS Vocabulary"/>
- <object name="roles" meta_type="CPS Directory Vocabulary"/>
- <object name="search_portal_type_voc" meta_type="CPS Method Vocabulary"/>
- <object name="search_review_state_voc" meta_type="CPS Method Vocabulary"/>
- <object name="search_sort_results_by" meta_type="CPS Vocabulary"/>
- <object name="subject_voc" meta_type="CPS Vocabulary"/>
-</object>
+ </object>
