Started working on config handling