Add the ability to build properly