complete first pass for #5