- Merge client and server into one file - Change test script to reflect this - More nuanced option handling