complete

completed setting up conditionals