progress on server logic
merge changes
update logic