Added TODOS
Try to validate better on iPhone