Almost done look at TODO!!!