Settings Module essentially

Not totally finished.
Some cosmetic changes.