did some code reviewing with Stephen