White space handling. Work in progress...