Corrected class names and implementaation. Still will not run "server"
portion