Update

Reworked, includes templating engine and templates for clarity and
separation of logic and markup