First iteration of the capstone rebuild