whitespace control working version. tests pass.