Configuration added with still some ToDos