After a brief introduction to standard pure state entanglement measures I will review some of our work on the way non-integrability impacts entanglement, showing for instance the enhancement of bipartite entanglement with chaos. We will discuss coupled tops, Ising chains in tilted magnetic fields and the Harper map as models to study bipartite and multipartite entanglement under a transition to chaos. We will point to the natural the use of random matrix theory and random state entanglement in this context.