I ALSO EDITED ALL THE STUFF I FORGOT TO ADD TO THE APP