slight style changes and server calls working