Made into a module.
Added new sections.