Cleaned up sample, need to handle collection changes better now.