Commented out some elements for presentation...will need to reverse