Code complete on qw rewrite

Some small test issues still