Refactored to remove POC code.