not working yet
fix for week view, renaming classes