Realized I was making this WAY too complicated. Simplified. And updated version number.