maybe these should be sepearte thingies