1.0 rewrite in progress