Actually build it right