Template methods in headers.

Working now, still some house-keeping to do.