WIP. whitespace fixes, re-writing analyzing.