Rewrote to use session (tests all broke)