Moved template solver to dev branch