Started adding if statements, fixing comments