coming together, just views and templates now