Finish making the thing work