buncha things. forgot to commit before I stopped