Worked on extensions - added Website code.
enerate_filename seems to work now.
Further tweaks.