Cleaned up Poll, Added Roll