convering enough of the views (as I go) to get the site functional, using haml