WIP: Almost working
Add define support for defining templates with components directly