Flushing out the server code further into more accurate methods.