moving towards a more OO server approach