Added the last of the old methods and refactored dateWithYear