Not finished variant
Some home fixes
Added generate
New variant