wip-Development

working on tests next
Needless to say, this is awkward and not really necessary. Pass them as arguments when you find the need to redirect into this. You can get rid of them from the session entirely.