General Reshuffle

Moved some functions around, created a few more 'stub' functions in
order to have a plan of all the stuff I need to do.

Also, sessions should be working correctly.