First pass at upgrading to latest version of flexpaper