midway through refactor.
Added some content.