Nawqaan 232

Wanted to get this out before refactoring. Still have a pending question regarding unloaded annual data and whether we should be handling that better.
No good reason, I'll but it inside.