Small changes to templates, work on condition construction.
Condition creation is now templated.