Started building out supporting library functionality (and unit tests).