Improved object model... I still need to figure out how I will handle the week ending logic