updated todo
made progress on server, server tests