Merge in working branch

Figured it was about time, being 50 commits ahead