Merged in some uncommitted stuff on space server. And added initial code for Labibus.