Rename, and 2 applications are working. Almost done here