WIP: Working in new app

by Marcio Toledo