updated server code, basic tool now working