svn path=/trunk/; revision=1596
More work on the code. Added more for the framework. Miguel. svn path=/trunk/; revision=1593