added structured year type, started adding tests