Added and finished with config for now