left some stuff off the last commit