reformatted
splitting functionality to servers looks complete