reorganise a liitle, start working through config docs