The Big Merge

Attempting to merge everything from experimental into master. Could require a lot of renaming, reorganizing and debugging afterward.