Moved date funcs into custom class methods