Actually build it right.