added TODO's for everything that still needs testing