First run-through of gabe and steiner's suggestions