Final rebuild... For now anyways