The edit fell apart, so this includes some edited files to ensure it works correctly.