Moving over to haml
Done for now