doing more experimentation, but pushed my latest changes