restructuring to be a real app step 1.