Adding some changes. Woohoo.
Fixed idiot's merge conflicts.