finished timing spec
undid a bunch of changes
stashing changes