added working control panel with points for server
merge conflicts