Add build code and comments