Shamefully massive commit of a bunch of good changes.
Remove legacy variable.
Merge pull request #1 from circatree/dev-ish

Shamefully massive update