stuff i hope doesn't conflict

stuff i hope doesn't conflict