Commit

Isolated smarty implementation