Working on some stuff

To be used later