Added a bunch of new exciting stuff. See master.