i think most of the glue now works + passes tests