This commit is just for properly moving the code between work stations. It doesn't work as expected for the moment.