Still need more fixes
modified:   src/Client.hs