The last commit did not contain the majority of changes because of a slight mishap. This contains the real changeset.