2nd commit - More goodness but still in-progress.