What Ive done so far in the rebuild