diff --git a/TODO b/TODO
index 72add53..b2fe94a 100644
--- a/TODO
+++ b/TODO
@@ -1,33 +1,11 @@
 UI:
+    * use key_dates to highlight when I quit, when we own car
 
 For bills:
-    Future bills:
-        * longer-term: make the moment we quit / own car trigger new bill creation, and remove hard-coded logic on costs - just use bill_data created
-            - this will then cover handling different bill_types or growth models
+    [DONE] * calc quit date based on finance data
+    [DONE] * calc date of car lease end or buyout
+    * use this to populate bill estimates, so this allows totals / year and simplifies calc.py
 
-    * might need to be able to mark a specific bill as an outlier - so we ignore the data somehow (think Gas is messing with my bills)
+    * might need to be able to mark a specific bill as an outlier:
+        - so we ignore the data somehow (think Gas is messing with my bills)
         - and even electricity, water, etc. for when we were away in Europe but mostly gas/elec
-
-LONGER/HARDER:
-    * need to work out 'first bill' and 'last bill' to auto-fill missing bills based on
-      -- all missing bills follow varying growth models & its by choice -- therefore I need this in DB
-         - ANN: flat, min, avg, max, manual
-         - QTR: flat, qtrly seasonal: min/avg/max/manual, qtrly simple: min/avg/max/manual, annual: min/avg/max/manual
-         - MON: flat, monthly: min/avg/max/manual, annual: min/avg/max/manual
-      -- use this logic to add missing bills (date):
-           -- ANN: missing annual bill, find date based on MM-DD and add new year - given we start with first_bill anyway, will only be used for future bill predictions
-           -- QTR: missing quarterly bill, find date based on MM-DD and ??? - can have missing bilsl in first year
-           -- MON: missing monthly bills, find date based on DD and put in each missing month 
-      -- use this logic to add missing bills (amount):
-           -- ANN: future only, so add ann_growth (based on drop-down) for each future year
-           -- QTR: add growth (based on drop-down) for each future year
-           -- MON: add growth (based on drop-down) for each future year 
-
-MUCH LONGER/HARDER:
-    potentially for each bill_type, there are unique extras - e.g. THIS feels too hard:
-        water has 2 fixed charges (water & sewerage) and then a consumption charge (per ML)
-        elec has 1 fixe charge (daily) and then consumption (per kwh) BUT, also daily solar rate
-        gas has fixed charge and consumption
-        internet, kayo is monthly fixed (but can go up sometimes)
-        eweka is annual fixed
-        phone is messier again.