Redoing example app, it was more complex than what was really needed