Extended the basic framework. Ignored more files ...
Merged peacefully ...