First pass of haml-ising arrears