Beginning rewrite, check against latest version