Added important TODO
Removed dev .only and all tests are green for now