Commented up server classes