Let's get this moving...

Going to merge the 0.9.0 branch to master because master hardly even resembles the final product anymore.