Some refactoring, added initial support for notable days