Session: refactoring
Some experimental code