a good progress done. Just saving it with a know TODO list.