Fixed up some stuff in Week Calendar not following abstract, started work on porting over to week calendar.