Start on Monthly rules .... a bit messy :-/
Move class into new package