My branch from the main waldo_app