Refactored a little tiny bit. This is simpler, and clearer
Change a few things in the template and app, since I am looking at it all the time...