Lots of work on the server/parser; still needs to parse conditions, a bit more