Cleaned up client parsing, working on timeouts