Changed some files, added TODO