added configuration parser and such