Updated changes
Updated todo
Added comments for later
removed things