merge of Xiao's and Michael's v0 files, added TODO list