Hey! I found myself making “Week” and “Month” entities often and remade this and made it available:
Feel free to try. it out and provide feedback!