BART CODE MERGE 1ST PUSH

All code as changed by bart merged with rik's code;
Backup of project at local://
C:\Users\Barbera Streisand\workspace\manbow2gdxbackup_28-7 etc...