tlc - more work getting this into quickstart