Commit

More smarts with smarty