updated todo
other todo
ignore conflicts
deleted weird files