Major code rewrite - backward incompatible changes to config file!