WIP: First attempt are rebuilding everything needed