Cleaed up
Also added my todo list in DSR