nearly works
duplicates work
Code style updates
fixed all the required changes
Merge remote-tracking branch 'LitusProject/dev-shift-generator'