Initial Add -- Still needs doc and some cleanup.