Files checked properly now
Updated todo