Began refactor.
Moved member template.