Fixed a bad merge and added some remix stuff.