Attempting to bring over proof of concept logic to testing framework