First attempt at adding whitespace support