got server calls working
fixing merge conflicts