Make templated again.
Some work.