Recovery merged, article views and controllers added