Squashing hella bugs
Appending date code for week display