diff --git a/bin/heat b/bin/heat
index 6c81229563..fa55ad5189 100755
--- a/bin/heat
+++ b/bin/heat
@@ -61,7 +61,8 @@ def template_validate(options, arguments):
     it is in the correct format.
 
     Usage: heat validate \\
-        [--template-file=<template file>|--template-url=<template URL>]
+        [--template-file=<template file>|--template-url=<template URL>] \\
+        [options]
 
     --template-file: Specify a local template file.
     --template-url:  Specify a URL pointing to a stack description template.
@@ -75,6 +76,14 @@ def template_validate(options, arguments):
         logging.error('Please specify a template file or url')
         return utils.FAILURE
 
+    if options.parameters:
+        count = 1
+        for p in options.parameters.split(';'):
+            (n, v) = p.split('=')
+            parameters['Parameters.member.%d.ParameterKey' % count] = n
+            parameters['Parameters.member.%d.ParameterValue' % count] = v
+            count = count + 1
+
     client = get_client(options)
     result = client.validate_template(**parameters)
     print json.dumps(result, indent=2)
diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index c1deb0314b..5e5e04dc02 100644
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -164,7 +164,10 @@ class StackController(object):
 
         logger.info('validate_template')
         try:
-            return con.validate_template(stack, **req.params)
+            return rpc.call(con, 'engine',
+                            {'method': 'validate_template',
+                             'args': {'template': stack,
+                                      'params': dict(req.params)}})
         except rpc_common.RemoteError as ex:
             return webob.exc.HTTPBadRequest(str(ex))
 
@@ -179,6 +182,7 @@ class StackController(object):
                        {'method': 'delete_stack',
                         'args': {'stack_name': req.params['StackName'],
                         'params': dict(req.params)}})
+
         except rpc_common.RemoteError as ex:
             return webob.exc.HTTPBadRequest(str(ex))
 
diff --git a/heat/engine/eip.py b/heat/engine/eip.py
index a0d94cdcbc..5c2103542d 100644
--- a/heat/engine/eip.py
+++ b/heat/engine/eip.py
@@ -45,6 +45,12 @@ class ElasticIp(Resource):
         self.instance_id_set(ips.id)
         self.state_set(self.CREATE_COMPLETE)
 
+    def validate(self):
+        '''
+        Validate the ip address here
+        '''
+        return None
+
     def reload(self):
         '''
         get the ipaddress here
diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 951a38edfb..9ff1e75d96 100644
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -193,6 +193,12 @@ class Instance(Resource):
         else:
             self.state_set(self.CREATE_FAILED)
 
+    def validate(self):
+        '''
+        Validate the server's ip address
+        '''
+        return None
+
     def reload(self):
         '''
         re-read the server's ipaddress so FnGetAtt works.
diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index a1430a281c..3f3b58e511 100644
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -157,21 +157,22 @@ class EngineManager(manager.Manager):
         return {'stack': {'id': new_s.id, 'name': new_s.name,\
                 'created_at': str(new_s.created_at)}}
 
-    def validate_template(self, req, body=None):
+    def validate_template(self, context, template, params):
         """
         The validate_template method uses the stack parser to check
         the validity of a template.
 
-        arg1 -> http request params.
-        arg2 -> Template body.
+        arg1 -> RPC context.
+        arg3 -> Template of stack you want to create.
+        arg4 -> Params passed from API.
         """
 
         logger.info('validate_template')
-        if body is None:
+        if template is None:
             msg = _("No Template provided.")
             return webob.exc.HTTPBadRequest(explanation=msg)
 
-        s = parser.Stack('validate', body, 0, req.params)
+        s = parser.Stack('validate', template, 0, params)
         res = s.validate()
 
         return res
diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 00793b6fd1..05d4df1e2c 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -111,10 +111,28 @@ class Stack(object):
         http://docs.amazonwebservices.com/AWSCloudFormation/latest/ \
             APIReference/API_ValidateTemplate.html
         '''
-        response = {'ValidateTemplateResult': {
-                    'Description': 'bla',
-                    'Parameters': []}}
 
+        order = self.get_create_order()
+
+        response = None
+
+        for r in order:
+            try:
+                res = self.resources[r].validate()
+                if res:
+                    print 'setting response'
+                    response = {'ValidateTemplateResult': {
+                           'Description': 'Malformed Query Response [%s]' % res,
+                           'Parameters': []}}
+                    break
+            except Exception as ex:
+                logger.exception('validate')
+                failed = True
+
+        if response == None:
+            response = {'ValidateTemplateResult': {
+                        'Description': 'Successfully validated',
+                        'Parameters': []}}
         for p in self.parms:
             jp = {'member': {}}
             res = jp['member']
diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index c1bac4147a..53a711e6c6 100644
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -106,6 +106,13 @@ class Resource(object):
         self.stack.resolve_joins(self.t)
         self.stack.resolve_base64(self.t)
 
+    def validate(self):
+        logger.info('validating %s name:%s' % (self.t['Type'], self.name))
+
+        self.stack.resolve_attributes(self.t)
+        self.stack.resolve_joins(self.t)
+        self.stack.resolve_base64(self.t)
+
     def instance_id_set(self, inst):
         self.instance_id = inst
 
diff --git a/heat/engine/security_group.py b/heat/engine/security_group.py
index 68b9cb3e28..6d413a6c17 100644
--- a/heat/engine/security_group.py
+++ b/heat/engine/security_group.py
@@ -73,6 +73,12 @@ class SecurityGroup(Resource):
 
         self.state_set(self.CREATE_COMPLETE)
 
+    def validate(self):
+        '''
+        Validate the security group
+        '''
+        return None
+
     def delete(self):
         if self.state == self.DELETE_IN_PROGRESS or \
            self.state == self.DELETE_COMPLETE:
diff --git a/heat/engine/volume.py b/heat/engine/volume.py
index d420b442f1..92cec88684 100644
--- a/heat/engine/volume.py
+++ b/heat/engine/volume.py
@@ -46,6 +46,12 @@ class Volume(Resource):
         else:
             self.state_set(self.CREATE_FAILED)
 
+    def validate(self):
+        '''
+        Validate the volume
+        '''
+        return None
+
     def delete(self):
         if self.state == self.DELETE_IN_PROGRESS or \
            self.state == self.DELETE_COMPLETE:
diff --git a/heat/engine/wait_condition.py b/heat/engine/wait_condition.py
index 797d0d7eb1..2256d0516b 100644
--- a/heat/engine/wait_condition.py
+++ b/heat/engine/wait_condition.py
@@ -49,6 +49,12 @@ class WaitConditionHandle(Resource):
 
         self.state_set(self.CREATE_COMPLETE)
 
+    def validate(self):
+        '''
+        Validate the wait condition
+        '''
+        return None
+
     def delete(self):
         if self.state == self.DELETE_IN_PROGRESS or \
            self.state == self.DELETE_COMPLETE: