Add constants and put data fields into fieldsets
Contains:
Development branch
Full project committed with all fixes.
Better error handling and more error messages displayed.