WIP #6 - removed the reliance on the configuration file