Initial commit before template support.