started refactoring
small bug fixes
fixed national holidays bug