Fixed the "bug" I mentioned. Working liao

Now need do the calendar thing