reorganized code/not using mockups/finalizing code
reorganized code/not using mockups/finalizing code