In progress Stuff

To finish on laptop