Oops. Commented to too much code. This should get things working again.