Improvements in generator and bin #6 #7
Add skeleton for #6 and #7
Adjust bin and skeleton for #6 #7