25 - better handling of immediate retirement, adding points to calculate intersection to retirement data returned, better formatting of dates on x-axis for short time periods