First commit -- Applied main infrastructure
Merge http://github.com/samueleishion/Descartes