First commit of 3.0

Now with Smarty!