Convert spaces to Tabs - Hopefully that doesn't cause too much merge problems... Added functionality to ServerModelFacade for lots of features.