working on serverside reorganizing