Suggestions
Full Tracking of TFSA contribution room
When draw downs trigger withdrawals from a TFSA account, this creates room to re-contribute in subsequent years. The current modelling never puts money back into the TFSA, other than the new annual amounts.