Bug fixes to get setup and control working + add a template for a
sample application.