Moving stuff to haml...