Merge pull request #38 from cmcall/master

Commented Out Yarn Logic
Added a bunch of stuff to the yarn, still really early, haven't tested or even compltely thought through it all yet. Don't kill me too hard