Updated conditionals, started loops