Stripped down and simplified to client only parsing