Finally got the file switches working,  - console log messages still in place - should be removed for next commit...