I really sucked at whitespace in the past.
Should be mostly complete...