Setup basic Add Year structure plus minor changes