converted 2 of 3 files to haml