Polished the code a bit, added nested year__ lookups