Patrick - Fixing todo