diff --git a/package.json b/package.json
index a76fb45..aa88c58 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,10 @@
   },
   "author": "Ivan Florentin <ivan@sinergetica.com>",
   "license": "ISC",
+  "repository" :
+  { "type" : "git"
+  , "url" : "https://github.com/ivanflorentin/ProvideAppCRUD"
+  },
   "dependencies": {
     "babel-core": "^6.7.4",
     "babel-eslint": "^4.1.5",
diff --git a/src/edit.js b/src/edit.js
index fb8e119..ed2a54d 100644
--- a/src/edit.js
+++ b/src/edit.js
@@ -1,5 +1,5 @@
 import React, {PropTypes} from 'react'
-import {List, ListItem,ListSubHeader, Button, Input} from 'react-toolbox'
+import {List, ListItem, ListSubHeader, Button, Input} from 'react-toolbox'
 
 export default function (compDef) {
   const {componentName,
@@ -12,23 +12,24 @@ export default function (compDef) {
   fieldNames.map((fieldName)=>{
     if (fields[fieldName].relation) {
       const relation = fields[fieldName].relation
-      const relationProperName = relation.toUpperCase() + relation.substring(1)
+      const relationProperName = relation[0].toUpperCase() + relation.substring(1)
       propTypes[`${relation}Routes`] = PropTypes.object
       propTypes[`${relation}Templates`] = PropTypes.object
-      propTypes[`relationDisplay${relationProperName}`] = PropTypes.func
+      propTypes[`save${componentProperName}${relationProperName}`] = PropTypes.func
+      propTypes[`delete${componentProperName}${relationProperName}`] = PropTypes.func
       propTypes[`${relation}ComponentDef`] = PropTypes.object
-      propTypes[`${relation}List`] = PropTypes.array
+      propTypes[`${relation}List`] = PropTypes.object
       propTypes[relation] = PropTypes.object
     }
   })
   const ComponentEdit = (props) =>{
     const next = Object.assign({}, props[componentName])
+    console.log('next', next, props)
     const save = () =>{props[`save${componentProperName}`](next)}
     const store = () =>{props[`store${componentProperName}`](next)}
     const {goBack} = props
     const listCaption = `Ingrese datos de ${componentProperName}`
 
-
     const listFields = fieldNames.map((fieldName)=>{
       let label = fields[fieldName].label
       if (!label || label === '') {
@@ -42,51 +43,40 @@ export default function (compDef) {
       }
       if (fields[fieldName].relation) {
 	const relation = fields[fieldName].relation
-	console.log('relation',props[relation])
 	const relationList = props[`${relation}List`]
 	const relationComponentDef = props[`${relation}ComponentDef`]
-	const relationProperName = relation.toUpperCase() + relation.substring(1)
+	const relationProperName = relation[0].toUpperCase() + relation.substring(1)
+	const saveRelation = props[`save${componentProperName}${relationProperName}`]
+	const deleteRelation = props[`delete${componentProperName}${relationProperName}`]
 	const routes = `${relation}Routes`
 	const listRoute = props[routes][`${relation}List`]
 
 	if (next[relation]===undefined) {next[relation]=[]}
 	if (next[`${relation}Selecting`]) {
-	  if (next[relation].indexOf(props[relation].uuid)===-1) {
-	    console.log('adding', props[relation].uuid)
-	    next[relation].push(props[relation].uuid)
-	  }
+	    saveRelation(props[relation].uuid)
 	  delete next[`${relation}Selecting`]
 	}
-	const relListFields= relationList.filter(comp =>{
-	  if (next[relation].indexOf(comp.uuid)) {
-	    return true
-	  }
-	  return false
-	}).map(comp=>{
+	const ids = Object.keys(relationList)
+	const relListFields = ids.map(id => {
+	  const comp = relationList[id]
 	  let thisComp = []
 	  for (let key in comp) {
 	    thisComp.push(<div key={key}>{key}: {comp[key]}</div>)
 	  }
 	  return <div key={comp.uuid}>{thisComp}
-	    <Button icon='close' floating accent mini onClick={
-	      () =>{
-		const idx = next[relation].indexOf(comp.uuid)
-		console.log(idx, next[relation][idx])
-		next[relation] = [
-		  ...next[relation].slice(0, idx),
-		  ...next[relation].slice(idx+1)]
-		save()
-	      }
-	    }/>
+	  <Button icon='close' floating accent mini onClick={
+	    () =>{
+	      deleteRelation(comp.uuid)
+	    }
+	  }/>
 	  </div>
 	})
-
 	return <div key={fieldName}>
 	  <label>{relation}</label>
 	  <List>{relListFields}</List>
 	  <Button icon='add' onClick={() => {
 	    next[`${relation}Selecting`] = true
-	    save()
+	    //save()
 	  props.pushRoute(listRoute)
 	}}
 	  /></div>
diff --git a/src/list.js b/src/list.js
index c1c8a31..a529660 100644
--- a/src/list.js
+++ b/src/list.js
@@ -12,8 +12,10 @@ export default function (compDef) {
     const displayURL = `${url.slice(0, url.lastIndexOf('/')+1)}display`
     const editURL = `${url.slice(0, url.lastIndexOf('/')+1)}edit`
     const list = props[`${componentName}List`]
-//    console.log('list', list)
-    const Items = list.map((item, index) =>{
+    console.log('list', list)
+    const ids = Object.keys(list)
+    const Items = ids.map((id, index) =>{
+      const item = list[id]
       let itemLegend = ''
       for (let field in fields) {
 	let label = fields[field].label
@@ -28,23 +30,23 @@ export default function (compDef) {
       rightActions={[
 	  <Button key='edit' icon='edit' floating accent mini
 	onClick={() =>{
-	  props[`select${componentProperName}`](props[`${componentName}List`][index])
+	  props[`select${componentProperName}`](item)
 	  props.pushRoute(editURL)
 	}}
 	  />,
 	  <Button key='display' icon='description' floating accent mini
 	  	onClick={() =>{
-	  props[`select${componentProperName}`](props[`${componentName}List`][index])
+	  props[`select${componentProperName}`](item)
 		  props.pushRoute(displayURL)
 	}}/>,
           <Button key='select' icon='done' floating accent mini
 	onClick={() =>{
-	  props[`select${componentProperName}`](props[`${componentName}List`][index])
+	  props[`select${componentProperName}`](item)
 	  props.goBack()
 	}}/>,
           <Button key='delete' icon='close' floating accent mini
 	onClick={() =>{
-	  props[`delete${componentProperName}`](props[`${componentName}List`][index])
+	  props[`delete${componentProperName}`](item)
 	}}/>
       ]}
 	/>
@@ -71,7 +73,7 @@ export default function (compDef) {
     pushRoute: PropTypes.func,
     goBack: PropTypes.func
   }
-  ComponentList.propTypes[`${compDef.componentName}List`] = PropTypes.array
+  ComponentList.propTypes[`${compDef.componentName}List`] = PropTypes.object
   ComponentList.propTypes[`deselect${componentProperName}`] = PropTypes.func
   ComponentList.propTypes[`select${componentProperName}`] = PropTypes.func
   ComponentList.propTypes[`delete${componentProperName}`] = PropTypes.func
diff --git a/src/providers.js b/src/providers.js
index 7aa24ec..5b02706 100644
--- a/src/providers.js
+++ b/src/providers.js
@@ -16,15 +16,17 @@ export default function (compDef) {
   const templatesName = componentName + 'Templates'
   const componentDefinitionName = componentName + 'ComponentDef'
 
+  let fieldNames = Object.keys(fields)
+
+  /*
   const crudInit = {}
   const crudErrorInit = {}
-  let fieldNames = Object.keys(fields)
   if (fieldNames.length > 0) {
     for (let fieldName of fieldNames) {
       crudInit[fieldName] = fields[fieldName].defaultValue
       crudErrorInit[`${fieldName}Error`] = ''
     }}
-
+  */
   const SELECT = `SELECT_${componentCapitalName}`
   const DESELECT = `DESELECT_${componentCapitalName}`
   const SAVE = `SAVE_${componentCapitalName}`
@@ -36,6 +38,8 @@ export default function (compDef) {
   const SET_TEMPLATE = `SET_TEMPLATE_${componentCapitalName}`
   const DELETE_TEMPLATE = `DELETE_TEMPLATE_${componentCapitalName}`
   const SET_COMPONENT_DEF = `SET_COMPOENET_DEF_${componentCapitalName}`
+  const SAVE_RELATION = `SAVE_RELATION`
+  const DELETE_RELATION = `DELETE_RELATION`
 
   const actions = {}
   const reducers = {}
@@ -74,6 +78,22 @@ export default function (compDef) {
     return {type: SET_COMPONENT_DEF, componentDef}
   }
 
+  if (fieldNames.length > 0) {
+    for (let fieldName of fieldNames) {
+      const fieldDef = fields[fieldName]
+      const relationName = fieldDef.relation
+      if (relationName !== undefined) {
+	const relationProperName = relationName[0].toUpperCase() + relationName.substring(1)
+	actions[`save${componentProperName}${relationProperName}`] = (id) =>{
+	  return {type: SAVE_RELATION, fieldName, id}
+	}
+	actions[`delete${componentProperName}${relationProperName}`] = (id) =>{
+	  return {type: DELETE_RELATION, fieldName, id}
+	}
+      }
+    }
+  }
+
   reducers[componentDefinitionName] = (state = {}, action) =>{
     switch (action.type) {
     case SET_COMPONENT_DEF: {
@@ -122,6 +142,7 @@ export default function (compDef) {
   reducers[componentName] = (state = {isValid: false}, action) =>{
     switch (action.type) {
     case SELECT: {
+      console.log('select', state, action)
       return action.component
     }
     case DESELECT: {
@@ -147,37 +168,50 @@ export default function (compDef) {
       }
       return next
     }
+    case SAVE_RELATION: {
+      const {fieldName, id} = action
+      if (id === undefined) {
+	return state
+      }
+      const next = Object.assign({}, state)
+      next[fieldName] = Object.assign({}, state[fieldName])
+      console.log ('save', fieldName, id, next)
+      if (next[fieldName] === undefined) {
+	next[fieldName] = {}
+      }
+      next[fieldName][id] = id
+      return next
+    }
+    case DELETE_RELATION: {
+      const next = Object.assign({}, state)
+      const {fieldName, id} = action
+      console.log ('delete', fieldName, id, state)
+      next[fieldName] = Object.assign({}, state[fieldName])
+      delete next[fieldName][id]
+      return next
+    }
     default: return state
     }
   }
 
-  reducers[componentListName] = (state = [], action) =>{
+  reducers[componentListName] = (state = {}, action) =>{
     switch (action.type) {
     case LOAD: {
       return action.list
     }
     case STORE: {
-      if (action.component.uuid === undefined) {
-	return [
-	  ...state,
-	  Object.assign({}, action.component, {uuid: uuid.v4()})
-	]
-      }
-      const next = state.map((component)=>{
-	if (component.id === action.component.uuid) {
-	  return action.component
-	}
-	return component
-      })
+       let id = ''
+      const next = {...state}
+      if (action.component.uuid) {
+	id = action.component.uuid
+	next[id] = Object.assign({}, action.component, {uuid: id})
+      } else { id = uuid.v4() }
+      next[id] = Object.assign({}, action.component, {uuid: id})
       return next
     }
     case DELETE: {
-      let next = []
-      state.map((component) =>{
-	if (component.uuid !== action.component.uuid) {
-	  next.push(component)
-	}
-      })
+      const next = Object.assign({}, state)
+      delete next[action.component.uuid]
       return next
     }
     default: {