More work on articles
Trying to exit this mess..