Metro App Work

Started work on the metro app. Begun renaming everything to "Pupi"