Checkpoint: begin reworking build