Inital config done, needs testing