Fixed system parse. Rules will do l8r.