Feature/current year settings [READY TO MERGE]