Front end version 2 work in progress

Again, this is a good candidate for a view helper.