Reconstruction

Merge reconstruction code. Stage 1.