adding a bunch since last commit