adding haml
adding haml, removing articles, adding collections