Updated! Organized the file a little better