keeping all the commented stuff in here makes me squirmy. i'd rather knock it down to just the required lines.