David's code is not integrating well. Taking a different approach. Backing up for safety