Conditonals-Wacky

Changed the variables around that were getting calculated to be correct