Major rewrite of the codebase to significantly simplify things and make everything just work better.
Merge remote-tracking branch 'origin/master'