Fixed Erik's merge, everything works
Merging Jeff's changes
Merging Jeff's changes
Fixing my mistakes