Committing some changes before merging with ryan's code.