Commented out more checks. Added todo.