added a more full featured server