Still working on the taskqueue; also address code review on the server side code