liam's reorganization and a start to making it flow