Added short year to long year conversion
Completed import
Cleaned up