Added a config file, further tinkering in classes