Development now back on track; updated TODO; need to run further tests on fetch code, insert code