pushed our final version of shtuff