Change stubs, add new variables

preparation for networking stuff