changed main for testing, added client