Trying to move some stuff from my master to my development branch. Sorry if this goes wrong