Added support for weekends
Tried to remove some of the one letter variables

I'm in favour of leaving 1 letter variables in list comprehensions as
it's not used outside of that line