Finish converting to haml