added a conf file and stuff