started on new rewrite