Bug fix: correct number of messages to be sent back to client
Beginning work on Retrofit