add boolean guard to 'if'. add FQNs to objects.