Cleaned up server and client somewhat, still no inline results though (: