es6ify session; add factories