started the refactoring to real app